From 4000495da9f30d030b1622632354caf6e1c33863 Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Tue, 28 Feb 2023 12:21:07 +0100 Subject: [PATCH] archiso 70 --- archiso/airootfs/etc/mkinitcpio.conf | 22 +++++++-------- archiso/airootfs/etc/ssh/sshd_config | 6 ++--- .../qemu-guest-agent.service | 1 - archiso/grub/grub.cfg | 27 ++++++++++++------- archiso/syslinux/archiso_head.cfg | 2 +- archiso/syslinux/archiso_tail.cfg | 6 ++--- .../30-build-the-iso-the-first-time.sh | 2 +- .../40-build-the-iso-local-again.sh | 2 +- 8 files changed, 37 insertions(+), 31 deletions(-) delete mode 120000 archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service diff --git a/archiso/airootfs/etc/mkinitcpio.conf b/archiso/airootfs/etc/mkinitcpio.conf index 3918d64..be5c1ac 100644 --- a/archiso/airootfs/etc/mkinitcpio.conf +++ b/archiso/airootfs/etc/mkinitcpio.conf @@ -3,7 +3,7 @@ # The following modules are loaded before any boot hooks are # run. Advanced users may wish to specify all system modules # in this array. For instance: -# MODULES=(usbhid xhci_hcd) +# MODULES=(piix ide_disk reiserfs) MODULES=() # BINARIES @@ -29,30 +29,30 @@ FILES=() # 'filesystems' is _required_ unless you specify your fs modules in MODULES # Examples: ## This setup specifies all modules in the MODULES setting above. -## No RAID, lvm2, or encrypted root is needed. +## No raid, lvm2, or encrypted root is needed. # HOOKS=(base) # ## This setup will autodetect all modules for your system and should ## work as a sane default -# HOOKS=(base udev autodetect modconf block filesystems fsck) +# HOOKS=(base udev autodetect block filesystems) # ## This setup will generate a 'full' image which supports most systems. ## No autodetection is done. -# HOOKS=(base udev modconf block filesystems fsck) +# HOOKS=(base udev block filesystems) # -## This setup assembles a mdadm array with an encrypted root file system. -## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices. -# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck) +## This setup assembles a pata mdadm array with an encrypted root FS. +## Note: See 'mkinitcpio -H mdadm' for more information on raid devices. +# HOOKS=(base udev block mdadm encrypt filesystems) # -## This setup loads an lvm2 volume group. -# HOOKS=(base udev modconf block lvm2 filesystems fsck) +## This setup loads an lvm2 volume group on a usb device. +# HOOKS=(base udev block lvm2 filesystems) # ## NOTE: If you have /usr on a separate partition, you MUST include the -# usr and fsck hooks. +# usr, fsck and shutdown hooks. HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard) # COMPRESSION -# Use this to compress the initramfs image. By default, zstd compression +# Use this to compress the initramfs image. By default, gzip compression # is used. Use 'cat' to create an uncompressed image. #COMPRESSION="gzip" #COMPRESSION="bzip2" diff --git a/archiso/airootfs/etc/ssh/sshd_config b/archiso/airootfs/etc/ssh/sshd_config index 93f7d63..dc22c11 100644 --- a/archiso/airootfs/etc/ssh/sshd_config +++ b/archiso/airootfs/etc/ssh/sshd_config @@ -58,7 +58,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitEmptyPasswords no # Change to no to disable s/key passwords -#KbdInteractiveAuthentication yes +KbdInteractiveAuthentication no # Kerberos options #KerberosAuthentication no @@ -75,7 +75,7 @@ AuthorizedKeysFile .ssh/authorized_keys # be allowed through the KbdInteractiveAuthentication and # PasswordAuthentication. Depending on your PAM configuration, # PAM authentication via KbdInteractiveAuthentication may bypass -# the setting of "PermitRootLogin without-password". +# the setting of "PermitRootLogin prohibit-password". # If you just want the PAM account and session checks to run without # PAM authentication, then enable this but set PasswordAuthentication # and KbdInteractiveAuthentication to 'no'. @@ -88,7 +88,7 @@ UsePAM yes #X11DisplayOffset 10 #X11UseLocalhost yes #PermitTTY yes -PrintMotd no # pam does that +PrintMotd no #PrintLastLog yes #TCPKeepAlive yes #PermitUserEnvironment no diff --git a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service deleted file mode 120000 index 8e3ff80..0000000 --- a/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index b341ff6..5bebae3 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -3,15 +3,18 @@ insmod part_gpt insmod part_msdos insmod fat insmod iso9660 +insmod ntfs +insmod ntfscomp +insmod exfat +insmod udf # Use graphics-mode output insmod all_video insmod font if loadfont "${prefix}/fonts/unicode.pf2" ; then - insmod gfxterm set gfxmode="auto" terminal_input console - terminal_output gfxterm + terminal_output console fi # Enable serial console @@ -20,6 +23,15 @@ if serial --unit=0 --speed=115200; then terminal_output --append serial fi +# Search for the ISO volume +if [ -z "${ARCHISO_UUID}" ]; then + if [ -z "${ARCHISO_HINT}" ]; then + regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}" + fi + search --no-floppy --set=root --file '%ARCHISO_SEARCH_FILENAME%' --hint "${ARCHISO_HINT}" + probe --set ARCHISO_UUID --fs-uuid "${root}" +fi + # Set default menu entry default=alci timeout=15 @@ -32,15 +44,13 @@ play 600 988 1 1319 4 menuentry "Alci install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'alci' { set gfxpayload=keep - search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=4G copytoram=n initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "Alci install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'alci-accessibility' { set gfxpayload=keep - search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n accessibility=on + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on cow_spacesize=4G copytoram=n initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } @@ -48,18 +58,15 @@ if [ "${grub_platform}" == "efi" ]; then if [ "${grub_cpu}" == "x86_64" ]; then menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool { set gfxpayload=800x600,1024x768 - search --fs-uuid --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/memtest.efi + linux /boot/memtest86+/memtest.efi } menuentry "UEFI Shell" { insmod chain - search --no-floppy --set=root --label %ARCHISO_LABEL% chainloader /shellx64.efi } elif [ "${grub_cpu}" == "i386" ]; then menuentry "UEFI Shell" { insmod chain - search --no-floppy --set=root --label %ARCHISO_LABEL% chainloader /shellia32.efi } fi diff --git a/archiso/syslinux/archiso_head.cfg b/archiso/syslinux/archiso_head.cfg index 1154f78..671ab4e 100644 --- a/archiso/syslinux/archiso_head.cfg +++ b/archiso/syslinux/archiso_head.cfg @@ -12,7 +12,7 @@ MENU CMDLINEROW 14 MENU HELPMSGROW 16 MENU HELPMSGENDROW 29 -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu +# Refer to https://wiki.syslinux.org/wiki/index.php/Comboot/menu.c32 MENU COLOR border 30;44 #40ffffff #a0000000 std MENU COLOR title 1;36;44 #9033ccff #a0000000 std diff --git a/archiso/syslinux/archiso_tail.cfg b/archiso/syslinux/archiso_tail.cfg index e5339a2..e84897c 100644 --- a/archiso/syslinux/archiso_tail.cfg +++ b/archiso/syslinux/archiso_tail.cfg @@ -7,12 +7,12 @@ MENU LABEL Boot existing OS COM32 chain.c32 APPEND hd0 0 -# http://www.memtest.org/ +# https://www.memtest.org/ LABEL memtest MENU LABEL Run Memtest86+ (RAM test) -LINUX /%INSTALL_DIR%/boot/memtest +LINUX /boot/memtest86+/memtest -# http://hdt-project.org/ +# https://wiki.syslinux.org/wiki/index.php/Hdt_(Hardware_Detection_Tool) LABEL hdt MENU LABEL Hardware Information (HDT) COM32 hdt.c32 diff --git a/installation-scripts/30-build-the-iso-the-first-time.sh b/installation-scripts/30-build-the-iso-the-first-time.sh index 9eecbd5..70a4f69 100755 --- a/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/installation-scripts/30-build-the-iso-the-first-time.sh @@ -35,7 +35,7 @@ echo #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' # setting of the general parameters - archisoRequiredVersion="archiso 69-1" + archisoRequiredVersion="archiso 70-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso) diff --git a/installation-scripts/40-build-the-iso-local-again.sh b/installation-scripts/40-build-the-iso-local-again.sh index d6217d5..a9619a4 100755 --- a/installation-scripts/40-build-the-iso-local-again.sh +++ b/installation-scripts/40-build-the-iso-local-again.sh @@ -35,7 +35,7 @@ echo #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' # setting of the general parameters - archisoRequiredVersion="archiso 69-1" + archisoRequiredVersion="archiso 70-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso)