From 6f47c8a4d4651d859a2cd9921bda7bddcd7d5760 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 13 Aug 2025 13:43:37 +0200 Subject: [PATCH] Kernel: Switch ISO to LTS Kernel find . -type f -not -path '*/.git/*' -exec sed -i 's/linux-cachyos/linux-cachyos-lts/g' {} + Signed-off-by: Peter Jung --- archiso/airootfs/etc/mkinitcpio.d/linux.preset | 4 ++-- archiso/airootfs/usr/local/bin/nvidia-module-loader | 4 ++-- archiso/airootfs/usr/local/bin/removeun | 2 +- archiso/airootfs/usr/local/bin/removeun-online | 2 +- .../loader/entries/01-archiso-x86_64-linux.conf | 4 ++-- archiso/efiboot/loader/entries/fallback.conf | 4 ++-- archiso/grub/grub.cfg | 8 ++++---- archiso/grub/loopback.cfg | 8 ++++---- archiso/packages_desktop.x86_64 | 4 ++-- archiso/syslinux/archiso_pxe-linux.cfg | 12 ++++++------ archiso/syslinux/archiso_sys-linux.cfg | 8 ++++---- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/archiso/airootfs/etc/mkinitcpio.d/linux.preset b/archiso/airootfs/etc/mkinitcpio.d/linux.preset index 3dcc5a1..412097c 100644 --- a/archiso/airootfs/etc/mkinitcpio.d/linux.preset +++ b/archiso/airootfs/etc/mkinitcpio.d/linux.preset @@ -2,7 +2,7 @@ PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux-cachyos' +ALL_kver='/boot/vmlinuz-linux-cachyos-lts' archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' -archiso_image="/boot/initramfs-linux-cachyos.img" +archiso_image="/boot/initramfs-linux-cachyos-lts.img" diff --git a/archiso/airootfs/usr/local/bin/nvidia-module-loader b/archiso/airootfs/usr/local/bin/nvidia-module-loader index d1558af..625e06d 100755 --- a/archiso/airootfs/usr/local/bin/nvidia-module-loader +++ b/archiso/airootfs/usr/local/bin/nvidia-module-loader @@ -24,9 +24,9 @@ load_nvidia_modules() { if chwd --list | awk '{ if($2 == "nouveau" || $2 == "nvidia-dkms-390xx" || $2 == "nvidia-dkms-470xx") f=1 } END {exit (f == 1) ? 0 : 1 }'; then modprobe nouveau elif chwd --list | awk '{ if($2 == "nvidia-dkms") f=1 } END {exit (f == 1) ? 0 : 1 }'; then - load_nvidia_modules linux-cachyos-nvidia + load_nvidia_modules linux-cachyos-lts-nvidia elif chwd --list | awk '{ if($2 == "nvidia-open-dkms") f=1 } END {exit (f == 1) ? 0 : 1 }'; then - load_nvidia_modules linux-cachyos-nvidia-open + load_nvidia_modules linux-cachyos-lts-nvidia-open fi # Otherwise, do a fallback to nouveau anyway diff --git a/archiso/airootfs/usr/local/bin/removeun b/archiso/airootfs/usr/local/bin/removeun index e68b678..4c88634 100755 --- a/archiso/airootfs/usr/local/bin/removeun +++ b/archiso/airootfs/usr/local/bin/removeun @@ -43,7 +43,7 @@ local _packages_to_remove=( local _check_nvidia_card="$(chwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)" if [[ "${_check_nvidia_card}" -ne 0 ]]; then echo "No NVIDIA card detected. Removing nvidia drivers" - _packages_to_remove+=(linux-cachyos-nvidia-open nvidia-utils egl-wayland) + _packages_to_remove+=(linux-cachyos-lts-nvidia-open nvidia-utils egl-wayland) fi local xx diff --git a/archiso/airootfs/usr/local/bin/removeun-online b/archiso/airootfs/usr/local/bin/removeun-online index a1df016..6266add 100755 --- a/archiso/airootfs/usr/local/bin/removeun-online +++ b/archiso/airootfs/usr/local/bin/removeun-online @@ -10,7 +10,7 @@ _clean_packages() { for xx in "${_packages_to_remove[@]}"; do pacman -Rs "$xx" --noconfirm; done # making sure they are removed -# local _toberemoved_str=$'bash-completion\nxorg-xinit\nxorg-xkill\nxorg-xinput\nxorg-xrandr\nxorg-xrdb\nmkinitcpio-openswap\nalacritty\nkonsole\nkwin-scripts-forceblur\nnetworkmanager-vpnc\nnetworkmanager-qt\nnetworkmanager-openvpn\nwireguard-tools\nopenconnect\nopenvpn\nqt5-xmlpatterns\ndoxygen\ntcpdump\ndmidecode\nkparts\npolkit-qt5\nxorg-server\nxorg-apps\nqt5-tools\nzfs-utils\nlinux-cachyos-zfs\nwget\nvirtualbox-guest-utils\nxf86-video-vesa\nxf86-video-amdgpu\nxf86-video-intel\nnvidia-dkms\nnvidia-utils\nlightdm\nlightdm-gtk-greeter\nlightdm-webkit2-greeter\nbase-devel\nlinux-cachyos-headers\nplasma-browser-integration\nplasma-desktop\nplasma-firewall\nplasma-framework\nplasma-integration\nplasma-nm\nplasma-pa\nplasma-systemmonitor\nplasma-thunderbolt\nplasma-workspace\ndiscover\npackagekit-qt5\nxed\nparole\nristretto\ndolphin\ndolphin-plugins\ncapitaine-cursors\ngtk-engine-murrine\ngnome-themes-extra\nadwaita-icon-theme\nfile-roller\nlibwnck3\nnetwork-manager-applet\ngalculator\ncachy-browser\nkvantum-qt5\nqt5ct\nneofetch\nopen-vm-tools\nxf86-input-vmmouse\nxf86-video-vmware\ncachyos-kde-settings\ncachyos-picom-config\ncachyos-rate-mirrors\ncachyos-kernel-manager\nchwd\noctopi\nreflector-simple\nmeld\nparu\nnordic-theme-git\nlightly-git\ncachyos-nord-kde-theme-git\nchar-white' +# local _toberemoved_str=$'bash-completion\nxorg-xinit\nxorg-xkill\nxorg-xinput\nxorg-xrandr\nxorg-xrdb\nmkinitcpio-openswap\nalacritty\nkonsole\nkwin-scripts-forceblur\nnetworkmanager-vpnc\nnetworkmanager-qt\nnetworkmanager-openvpn\nwireguard-tools\nopenconnect\nopenvpn\nqt5-xmlpatterns\ndoxygen\ntcpdump\ndmidecode\nkparts\npolkit-qt5\nxorg-server\nxorg-apps\nqt5-tools\nzfs-utils\nlinux-cachyos-lts-zfs\nwget\nvirtualbox-guest-utils\nxf86-video-vesa\nxf86-video-amdgpu\nxf86-video-intel\nnvidia-dkms\nnvidia-utils\nlightdm\nlightdm-gtk-greeter\nlightdm-webkit2-greeter\nbase-devel\nlinux-cachyos-lts-headers\nplasma-browser-integration\nplasma-desktop\nplasma-firewall\nplasma-framework\nplasma-integration\nplasma-nm\nplasma-pa\nplasma-systemmonitor\nplasma-thunderbolt\nplasma-workspace\ndiscover\npackagekit-qt5\nxed\nparole\nristretto\ndolphin\ndolphin-plugins\ncapitaine-cursors\ngtk-engine-murrine\ngnome-themes-extra\nadwaita-icon-theme\nfile-roller\nlibwnck3\nnetwork-manager-applet\ngalculator\ncachy-browser\nkvantum-qt5\nqt5ct\nneofetch\nopen-vm-tools\nxf86-input-vmmouse\nxf86-video-vmware\ncachyos-kde-settings\ncachyos-picom-config\ncachyos-rate-mirrors\ncachyos-kernel-manager\nchwd\noctopi\nreflector-simple\nmeld\nparu\nnordic-theme-git\nlightly-git\ncachyos-nord-kde-theme-git\nchar-white' # local _toberemoved_packages # readarray -t _toberemoved_packages <<< "$_toberemoved_str" # local xxx 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 e029881..c4258ff 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,5 @@ title CachyOS x86_64 UEFI Default sort-key A -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.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/efiboot/loader/entries/fallback.conf b/archiso/efiboot/loader/entries/fallback.conf index 079a117..01102a4 100644 --- a/archiso/efiboot/loader/entries/fallback.conf +++ b/archiso/efiboot/loader/entries/fallback.conf @@ -1,5 +1,5 @@ title CachyOS x86_64 Legacy Hardware Fallback (nomodeset) sort-key C -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 1a07def..15d2f83 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -55,14 +55,14 @@ insmod ext2 # Menu entries 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% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/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/x86_64/initramfs-linux-cachyos-lts.img } menuentry "CachyOS Legacy Hardware (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-fallback' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/archiso/grub/loopback.cfg b/archiso/grub/loopback.cfg index f2ffdb2..d6cd68b 100644 --- a/archiso/grub/loopback.cfg +++ b/archiso/grub/loopback.cfg @@ -31,14 +31,14 @@ insmod ext2 # Menu entries 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=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img } menuentry "CachyOS Legacy Hardware (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'cachyos-fallback' { 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=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes - initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img } if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then diff --git a/archiso/packages_desktop.x86_64 b/archiso/packages_desktop.x86_64 index 28e1615..006f795 100644 --- a/archiso/packages_desktop.x86_64 +++ b/archiso/packages_desktop.x86_64 @@ -78,8 +78,8 @@ libfido2 libusb-compat libwnck3 linux-atm -linux-cachyos -linux-cachyos-zfs +linux-cachyos-lts +linux-cachyos-lts-zfs linux-firmware linux-firmware-marvell lsb-release diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index 37245dc..1b89a5d 100644 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the CachyOS install medium using NBD. 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 +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the CachyOS live medium using NFS. 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 +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the CachyOS live medium using HTTP. 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 +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.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 bf2f46d..8c30d3f 100644 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the CachyOS install medium on BIOS. 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 +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=pcspkr i915.modeset=1 amdgpu.modeset=1 nvme_load=yes # Fallback (nomodeset) @@ -15,6 +15,6 @@ Boot the CachyOS install medium on Bios in fallback mode It allows you to install CachyOS or perform system maintenance. ENDTEXT MENU LABEL CachyOS Fallback (nomodeset, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-cachyos-lts +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-cachyos-lts.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nomodeset nvme_load=yes