Update Archiso profile to match upstream changes

This commit is contained in:
2Shirt 2022-09-23 18:25:57 -07:00
parent a2e1c1fad3
commit 21da84e5e2
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
6 changed files with 17 additions and 7 deletions

View file

@ -359,8 +359,6 @@ function build_iso() {
| tee -a "$LOG_DIR/$DATETIME.log" | tee -a "$LOG_DIR/$DATETIME.log"
# Build better ISO # Build better ISO
rm -r "${ISO_DIR:-safety}/EFI"
rm -r "${ISO_DIR:-safety}/loader"
rsync -aI "$PROFILE_DIR/EFI/" "${ISO_DIR:-safety}/EFI/" rsync -aI "$PROFILE_DIR/EFI/" "${ISO_DIR:-safety}/EFI/"
rsync -aI --ignore-existing "$PROFILE_DIR/syslinux/" "${ISO_DIR:-safety}/syslinux/" rsync -aI --ignore-existing "$PROFILE_DIR/syslinux/" "${ISO_DIR:-safety}/syslinux/"
## Sketchy bit ## ## Sketchy bit ##

View file

@ -8,6 +8,7 @@ bc
bind bind
bluez bluez
bluez-utils bluez-utils
btrfs-progs
chntpw chntpw
cmatrix cmatrix
colordiff colordiff
@ -18,9 +19,13 @@ ddrescue
device-mapper device-mapper
diffutils diffutils
dmidecode dmidecode
dmraid
dos2unix dos2unix
dosfstools
e2fsprogs e2fsprogs
edk2-shell edk2-shell
exfatprogs
gptfdisk
hexedit hexedit
hfsprogs hfsprogs
htop htop
@ -50,17 +55,19 @@ mprime
mtools mtools
nano nano
ncdu ncdu
nvme-cli
openssh openssh
p7zip p7zip
perl perl
pipes.sh pipes.sh
reiserfsprogs
pv pv
python python
python-docopt python-docopt
python-psutil python-psutil
python-pytz python-pytz
python-requests python-requests
qemu-guest-agent
reiserfsprogs
reiserfsprogs reiserfsprogs
rfkill rfkill
rng-tools rng-tools

View file

@ -10,6 +10,7 @@ gtk-doc
gtk3 gtk3
hwloc hwloc
imlib2 imlib2
intltool
iwd iwd
json-glib json-glib
lhasa lhasa
@ -27,10 +28,11 @@ openssh
p7zip p7zip
pango pango
perl-rename perl-rename
reiserfsprogs
pv pv
refind refind
reiserfsprogs
rsync rsync
scdoc
startup-notification startup-notification
subversion subversion
syslinux syslinux

View file

@ -1,4 +1,5 @@
title Arch Linux (x86_64, UEFI) title %ARCHISO_LABEL%
sort-key 01
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/intel-ucode.img
initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img

View file

@ -1,4 +1,5 @@
title Arch Linux (x86_64, UEFI) Copy to RAM title %ARCHISO_LABEL% (Copy to RAM)
sort-key 02
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/intel-ucode.img
initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img

View file

@ -8,12 +8,13 @@ iso_application="KIT_NAME_FULL Linux Environment"
iso_version="$(date +%Y-%m-%d)" iso_version="$(date +%Y-%m-%d)"
install_dir="arch" install_dir="arch"
buildmodes=('iso') buildmodes=('iso')
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
arch="x86_64" arch="x86_64"
pacman_conf="pacman.conf" pacman_conf="pacman.conf"
airootfs_image_type="squashfs" airootfs_image_type="squashfs"
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
file_permissions=( file_permissions=(
["/root"]="0:0:750"
["/etc/shadow"]="0:0:400" ["/etc/shadow"]="0:0:400"
["/etc/gshadow"]="0:0:400" ["/etc/gshadow"]="0:0:400"
["/etc/skel/.ssh"]="0:0:700" ["/etc/skel/.ssh"]="0:0:700"