From c5c19a1e7099154b467917df7086e3ee383de81e Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Thu, 16 May 2024 12:24:02 +0330 Subject: [PATCH] fixed the initramfs --- iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf | 2 +- iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf | 2 -- .../loader/entries/02-archiso-x86_64-speech-linux.conf | 2 -- .../loader/entries/03-archiso-x86_64-ram-linux.conf | 2 -- .../entries/04-archiso-x86_64-ram-speech-linux.conf | 2 -- .../05-archiso-x86_64-compatibility-mode-linux.conf | 4 +--- iso/grub/grub.cfg | 4 ++-- iso/syslinux/archiso_sys-linux.cfg | 8 ++++---- 8 files changed, 8 insertions(+), 18 deletions(-) diff --git a/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf index 98dd514..b4b3095 100644 --- a/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf +++ b/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf @@ -1,2 +1,2 @@ -HOOKS=(base udev microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard) +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="xz" diff --git a/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index a536117..c724ea3 100644 --- a/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI) sort-key 01 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% diff --git a/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index c5270dc..57a5424 100644 --- a/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI) with speech sort-key 02 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% accessibility=on diff --git a/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf index 1805d1e..4008cdc 100644 --- a/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf +++ b/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI, Copy to RAM) sort-key 03 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% copytoram diff --git a/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf b/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf index f29737c..deba523 100644 --- a/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf +++ b/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI, Copy to RAM) with speech sort-key 04 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% copytoram accessibility=on diff --git a/iso/efiboot/loader/entries/05-archiso-x86_64-compatibility-mode-linux.conf b/iso/efiboot/loader/entries/05-archiso-x86_64-compatibility-mode-linux.conf index 1f733fb..98d9da2 100644 --- a/iso/efiboot/loader/entries/05-archiso-x86_64-compatibility-mode-linux.conf +++ b/iso/efiboot/loader/entries/05-archiso-x86_64-compatibility-mode-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install compatibility medium (x86_64, UEFI) -sort-key 01 +sort-key 05 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% nomodset diff --git a/iso/grub/grub.cfg b/iso/grub/grub.cfg index 2fdc1ff..8c68f7f 100644 --- a/iso/grub/grub.cfg +++ b/iso/grub/grub.cfg @@ -29,14 +29,14 @@ menuentry "Parch Linux install medium (x86_64, UEFI)" { 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% - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "Parch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s { 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% accessibility=on - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "UEFI Shell" { diff --git a/iso/syslinux/archiso_sys-linux.cfg b/iso/syslinux/archiso_sys-linux.cfg index 89f47a1..36d9981 100644 --- a/iso/syslinux/archiso_sys-linux.cfg +++ b/iso/syslinux/archiso_sys-linux.cfg @@ -5,7 +5,7 @@ It allows you to install Parch Linux or perform system maintenance. ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS) 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 +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Accessibility boot option @@ -16,7 +16,7 @@ It allows you to install Parch Linux or perform system maintenance with speech f ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS) with ^speech 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 +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on # Copy to RAM boot option @@ -27,7 +27,7 @@ It allows you to install Parch Linux or perform system maintenance. ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS, Copy to RAM) 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 +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram @@ -39,5 +39,5 @@ It allows you to install Parch Linux or perform system maintenance. ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS, compatibility) 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 +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodset