From 976e52bfc54629482d9f0352074b82d136654096 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 21 Oct 2022 19:58:32 +0200 Subject: [PATCH] Update systemd-boot loader entries Signed-off-by: Peter Jung --- archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf | 4 ++-- .../efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf | 4 ++-- archiso/efiboot/loader/entries/fallback.conf | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 archiso/efiboot/loader/entries/fallback.conf 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 ce6eed1..ee06d9f 100644 --- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,7 +1,7 @@ title CachyOS x86_64 UEFI Default -sort-key 01 +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% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 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 4cb9264..d4f461b 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,7 +1,7 @@ title CachyOS x86_64 UEFI NVIDIA (latest cards only) -sort-key 02 +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% archisolabel=%ARCHISO_LABEL% nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G nvidia nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 nvme_load=yes module_blacklist=pcspkr diff --git a/archiso/efiboot/loader/entries/fallback.conf b/archiso/efiboot/loader/entries/fallback.conf new file mode 100644 index 0000000..8f205d1 --- /dev/null +++ b/archiso/efiboot/loader/entries/fallback.conf @@ -0,0 +1,5 @@ +title CachyOS x86_64 Fallback (nomodeset) +sort-key C +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes