diff --git a/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf new file mode 100644 index 0000000..b4b3095 --- /dev/null +++ b/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf @@ -0,0 +1,2 @@ +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/airootfs/etc/mkinitcpio.conf.d/parchiso.conf b/iso/airootfs/etc/mkinitcpio.conf.d/parchiso.conf deleted file mode 100644 index 98dd514..0000000 --- a/iso/airootfs/etc/mkinitcpio.conf.d/parchiso.conf +++ /dev/null @@ -1,2 +0,0 @@ -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) -COMPRESSION="xz" diff --git a/iso/airootfs/etc/mkinitcpio.d/linux.preset b/iso/airootfs/etc/mkinitcpio.d/linux.preset index 05199b5..7f51749 100644 --- a/iso/airootfs/etc/mkinitcpio.d/linux.preset +++ b/iso/airootfs/etc/mkinitcpio.d/linux.preset @@ -1,9 +1,9 @@ # mkinitcpio preset file for the 'linux' package on archiso -PRESETS=('parchiso') +PRESETS=('archiso') ALL_kver='/boot/vmlinuz-linux' -archiso_config='/etc/mkinitcpio.conf.d/parchiso.conf' +archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' archiso_image="/boot/initramfs-linux.img" 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 new file mode 100644 index 0000000..98d9da2 --- /dev/null +++ b/iso/efiboot/loader/entries/05-archiso-x86_64-compatibility-mode-linux.conf @@ -0,0 +1,5 @@ +title Parch Linux install compatibility medium (x86_64, UEFI) +sort-key 05 +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodset diff --git a/iso/efiboot/loader/loader.conf b/iso/efiboot/loader/loader.conf index 982641e..2d137aa 100644 --- a/iso/efiboot/loader/loader.conf +++ b/iso/efiboot/loader/loader.conf @@ -1,3 +1,3 @@ timeout 15 default 01-archiso-x86_64-linux.conf -beep off +beep on 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 aa63aa1..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,5 +27,17 @@ 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 + + +# compatibility boot option +LABEL arch64compatibility +TEXT HELP +Boot the Parch Linux install medium on BIOS with compatibility mode. +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/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodset