From e556dad8d0d91c228f75d19ecbd0edf9f979a060 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Tue, 9 Dec 2025 16:31:41 +0100 Subject: [PATCH] kernel: Add stable kernel alongside LTS Kernel (#72) --- archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf | 2 +- .../efiboot/loader/entries/02-archiso-linux-cachyos.conf | 5 +++++ archiso/grub/grub.cfg | 8 +++++++- archiso/packages_desktop.x86_64 | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 archiso/efiboot/loader/entries/02-archiso-linux-cachyos.conf diff --git a/archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/archiso/airootfs/etc/mkinitcpio.conf.d/archiso.conf index 98dd514..b8128e7 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 microcode modconf 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/02-archiso-linux-cachyos.conf b/archiso/efiboot/loader/entries/02-archiso-linux-cachyos.conf new file mode 100644 index 0000000..01748b0 --- /dev/null +++ b/archiso/efiboot/loader/entries/02-archiso-linux-cachyos.conf @@ -0,0 +1,5 @@ +title CachyOS %ARCH% UEFI Default +sort-key A +linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos +initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 04cb432..5f881f7 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -1,6 +1,6 @@ # Defining the Version of the ISO. This line could be easy changed by a Script wich do that automatic before creating ISO self. # Default "GIT", because if somebody outside from the DEVs create a ISO, this ISO wouldnt have a specific Version number. -CACHYOS_VERSION="251016" +CACHYOS_VERSION="GIT" if [ "${grub_platform}" == 'efi' ]; then bios_or_uefi='(UEFI)!' @@ -63,6 +63,12 @@ insmod ext2 # Menu entries menuentry "CachyOS" --class arch --class gnu-linux --class gnu --class os --id 'cachyos' { + set gfxpayload=keep + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes + initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos.img +} + +menuentry "CachyOS LTS Kernel" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-lts' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-cachyos-lts archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-cachyos-lts.img diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64 index 18cbaa6..2b7fd05 100644 --- a/archiso/packages_desktop.x86_64 +++ b/archiso/packages_desktop.x86_64 @@ -82,6 +82,8 @@ libwnck3 linux-atm linux-cachyos-lts linux-cachyos-lts-zfs +linux-cachyos +linux-cachyos-zfs linux-firmware linux-firmware-marvell lsb-release