diff --git a/airootfs/etc/mkinitcpio.conf b/airootfs/etc/mkinitcpio.conf index 96a8752..b7c80b2 100644 --- a/airootfs/etc/mkinitcpio.conf +++ b/airootfs/etc/mkinitcpio.conf @@ -49,7 +49,7 @@ FILES=() # ## NOTE: If you have /usr on a separate partition, you MUST include the # 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) +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 # Use this to compress the initramfs image. By default, gzip compression diff --git a/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 0b2b8e1..7b24d28 100644 --- a/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,7 +1,5 @@ title Arch 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% zswap.enabled=0 diff --git a/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index c275443..a4093d1 100644 --- a/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,7 +1,5 @@ title Arch 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 zswap.enabled=0 diff --git a/grub/grub.cfg b/grub/grub.cfg index c31bded..7c8bf84 100644 --- a/grub/grub.cfg +++ b/grub/grub.cfg @@ -46,19 +46,19 @@ play 600 200 1 1 2 200 1 menuentry "Solarity Liveboot (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} copytoram=auto zswap.enabled=0 - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img } menuentry "Solarity Liveboot (x86_64, UEFI, copytoram=n)" --class arch --class gnu-linux --class gnu --class os --id 'archlinux-nocopytoram' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} copytoram=n zswap.enabled=0 - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img } menuentry "Solarity Liveboot with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on copytoram=auto zswap.enabled=0 - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img } if [ "${grub_platform}" == "efi" ]; then diff --git a/syslinux/archiso_pxe-linux.cfg b/syslinux/archiso_pxe-linux.cfg index f3edd96..9bbcd8f 100644 --- a/syslinux/archiso_pxe-linux.cfg +++ b/syslinux/archiso_pxe-linux.cfg @@ -5,7 +5,7 @@ It allows you to install Solarity Liveboot or perform system maintenance. ENDTEXT MENU LABEL Solarity Liveboot install medium (x86_64, NBD) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} cms_verify=y zswap.enabled=0 SYSAPPEND 3 @@ -16,7 +16,7 @@ It allows you to install Solarity Liveboot or perform system maintenance. ENDTEXT MENU LABEL Solarity Liveboot install medium (x86_64, NFS) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y zswap.enabled=0 SYSAPPEND 3 @@ -27,6 +27,6 @@ It allows you to install Solarity Liveboot or perform system maintenance. ENDTEXT MENU LABEL Solarity Liveboot install medium (x86_64, HTTP) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y zswap.enabled=0 SYSAPPEND 3 diff --git a/syslinux/archiso_sys-linux.cfg b/syslinux/archiso_sys-linux.cfg index b06a631..8d46f0d 100644 --- a/syslinux/archiso_sys-linux.cfg +++ b/syslinux/archiso_sys-linux.cfg @@ -5,7 +5,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Solarity Liveboot (x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=auto zswap.enabled=0 LABEL arch64copytoram @@ -15,7 +15,7 @@ It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Solarity Liveboot (x86_64, BIOS, copytoram=n) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=n zswap.enabled=0 # Accessibility boot option @@ -26,5 +26,5 @@ It allows you to install Arch Linux or perform system maintenance with speech fe ENDTEXT MENU LABEL Solarity Liveboot (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on copytoram=auto zswap.enabled=0