diff --git a/airootfs/etc/mkinitcpio.d/linux.preset b/airootfs/etc/mkinitcpio.d/linux.preset index 55096d9..39c6910 100644 --- a/airootfs/etc/mkinitcpio.d/linux.preset +++ b/airootfs/etc/mkinitcpio.d/linux.preset @@ -2,7 +2,7 @@ PRESETS=('archiso') -ALL_kver='/boot/vmlinuz-linux-zen' +ALL_kver='/boot/vmlinuz-linux-lts' ALL_config='/etc/mkinitcpio.conf' -archiso_image="/boot/initramfs-linux-zen.img" +archiso_image="/boot/initramfs-linux-lts.img" diff --git a/airootfs/etc/mkinitcpio.d/tcetlinux b/airootfs/etc/mkinitcpio.d/tcetlinux index b46b4a6..8baa217 100644 --- a/airootfs/etc/mkinitcpio.d/tcetlinux +++ b/airootfs/etc/mkinitcpio.d/tcetlinux @@ -1,14 +1,14 @@ -# mkinitcpio preset file for the 'linux-zen' package on tcetlinuxiso +# mkinitcpio preset file for the 'linux-lts' package on tcetlinuxiso PRESETS=('default' 'fallback') -ALL_kver='/boot/vmlinuz-linux-zen' +ALL_kver='/boot/vmlinuz-linux-lts' ALL_config='/etc/mkinitcpio.conf' #default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux-zen.img" +default_image="/boot/initramfs-linux-lts.img" #default_options="" #fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-zen-fallback.img" +fallback_image="/boot/initramfs-linux-lts-fallback.img" fallback_options="-S autodetect" diff --git a/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 298d734..1d59935 100644 --- a/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,7 +1,7 @@ title TCET Linux install medium (x86_64, UEFI) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=n cow_spacesize=5G nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes diff --git a/grub/grub.cfg b/grub/grub.cfg index 13d9b24..9a173fe 100644 --- a/grub/grub.cfg +++ b/grub/grub.cfg @@ -44,8 +44,8 @@ timeout_style=menu menuentry "TCET Linux install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'tcetlinux' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} copytoram=n cow_spacesize=5G nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} copytoram=n cow_spacesize=5G nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img } if [ "${grub_platform}" == "efi" ]; then diff --git a/packages.x86_64 b/packages.x86_64 index ce2e741..555e3de 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -49,7 +49,7 @@ less lftp libfido2 libusb-compat -linux-zen +linux-lts #linux-atm linux-firmware linux-firmware-marvell @@ -279,4 +279,4 @@ tcet-linux-set-once tcet-linux-wallpaper #newFont-terminal -ttf-fira-mono \ No newline at end of file +ttf-fira-mono diff --git a/syslinux/archiso_sys-linux.cfg b/syslinux/archiso_sys-linux.cfg index ecefd67..77f7dc1 100644 --- a/syslinux/archiso_sys-linux.cfg +++ b/syslinux/archiso_sys-linux.cfg @@ -5,6 +5,6 @@ Boot the TCET Linux install medium on BIOS. It allows you to install TCET Linux or perform system maintenance. ENDTEXT MENU LABEL TCET Linux install medium (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 +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts +INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=n cow_spacesize=5G nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes