From 2e21fba9a041791b64545cdc5309bb4c9cc915bb Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Thu, 29 Dec 2022 09:45:31 +0100 Subject: [PATCH] archiso --- archiso/airootfs/root/.zlogin | 2 +- .../loader/entries/02-archiso-x86_64-speech-linux.conf | 2 +- archiso/grub/grub.cfg | 5 +++++ archiso/packages.x86_64 | 5 ++--- archiso/syslinux/archiso_pxe-linux.cfg | 6 +++--- installation-scripts/30-build-the-iso-the-first-time.sh | 2 +- installation-scripts/40-build-the-iso-local-again.sh | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/archiso/airootfs/root/.zlogin b/archiso/airootfs/root/.zlogin index 0fb119d..bf6bc8f 100644 --- a/archiso/airootfs/root/.zlogin +++ b/archiso/airootfs/root/.zlogin @@ -1,5 +1,5 @@ # fix for screen readers -if grep -Fq 'accessibility=' /proc/cmdline &> /dev/null; then +if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then setopt SINGLE_LINE_ZLE fi diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index d7127d1..d6bc339 100644 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -4,4 +4,4 @@ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n accessibility=on +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n accessibility=on diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 95cd906..b341ff6 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -46,6 +46,11 @@ menuentry "Alci install medium with speakup screen reader (x86_64, UEFI)" --hotk 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 + } menuentry "UEFI Shell" { insmod chain search --no-floppy --set=root --label %ARCHISO_LABEL% diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 8f98565..fb45c36 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -38,8 +38,6 @@ grub hdparm hyperv intel-ucode -#ipw2100-fw -#ipw2200-fw irssi iw iwd @@ -62,6 +60,7 @@ man-pages mc mdadm memtest86+ +memtest86+-efi mkinitcpio mkinitcpio-archiso mkinitcpio-nfs-utils @@ -144,7 +143,7 @@ alci-calamares-config #alci-calamares-config-hardened #alci-calamares-config-lts #alci-calamares-config-pure -#alci-calamares-config-xanmod-edge +#alci-calamares-config-xanmod #alci-calamares-config-zen xterm diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index d812402..0eb1705 100644 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -6,7 +6,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NBD) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 LABEL arch64_nfs @@ -17,7 +17,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NFS) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify +APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 LABEL arch64_http @@ -28,5 +28,5 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, HTTP) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y SYSAPPEND 3 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 a3a2bf8..9eecbd5 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 68-1" + archisoRequiredVersion="archiso 69-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 3d8436d..d6217d5 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 68-1" + archisoRequiredVersion="archiso 69-1" buildFolder=$HOME"/alci-build" outFolder=$HOME"/Alci-Iso-Out" archisoVersion=$(sudo pacman -Q archiso)