From 5f2c2576ce2dfbccfb177b0e7276172477351ef6 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Tue, 12 Mar 2024 22:03:28 +0100 Subject: [PATCH] Microcode: Revert latest microcode changes since it breaks ventoy Signed-off-by: Peter Jung --- archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf | 2 +- archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf | 2 ++ .../efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf | 2 ++ archiso/grub/grub.cfg | 4 ++-- archiso/grub/loopback.cfg | 4 ++-- archiso/syslinux/archiso_pxe-linux.cfg | 6 +++--- archiso/syslinux/archiso_sys-linux.cfg | 4 ++-- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf index 98dd514..b4b3095 100644 --- a/archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf +++ b/archiso/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/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 7948146..54e2acc 100644 --- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,5 +1,7 @@ title CachyOS x86_64 UEFI Default sort-key A linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf index 950a876..65a91b3 100644 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf @@ -1,5 +1,7 @@ title CachyOS x86_64 UEFI NVIDIA (latest cards only) sort-key B linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 573c893..f2e1f80 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -65,13 +65,13 @@ insmod ext2 menuentry "CachyOS" --class arch --class gnu-linux --class gnu --class os --id 'cachyos' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img } menuentry "CachyOS with NVIDIA closed-source Driver (latest cards only 900+)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-nvidia' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img } menuentry "CachyOS Legacy Hardware (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-fallback' { diff --git a/archiso/grub/loopback.cfg b/archiso/grub/loopback.cfg index 697bf88..5717f28 100644 --- a/archiso/grub/loopback.cfg +++ b/archiso/grub/loopback.cfg @@ -32,13 +32,13 @@ insmod ext2 menuentry "CachyOS" --class arch --class gnu-linux --class gnu --class os --id 'cachyos' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img } menuentry "CachyOS with NVIDIA closed-source Driver (latest cards only 900+)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-nvidia' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img } menuentry "CachyOS Legacy Hardware (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-fallback' { diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index 0cca67d..ee74d30 100644 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -5,7 +5,7 @@ It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS install medium (x86_64, NBD) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -16,7 +16,7 @@ It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS install medium (x86_64, NFS) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -27,6 +27,6 @@ It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS install medium (x86_64, HTTP) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y SYSAPPEND 3 diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg index 6aad026..715c6b4 100644 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -5,7 +5,7 @@ It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS default (x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nouveau.modeset=1 module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes # Nvidia propritary (Non-Free) @@ -16,7 +16,7 @@ It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS NVIDIA (latest cards, x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=10G copytoram=n nvidia nvidia-drm.modeset=1 nvidia-drm.fbdev=1 nouveau.modeset=0 module_blacklist=nouveau,pcspkr i915.modeset=1 radeon.modeset=1 nvme_load=yes # Fallback (nomodeset)