From 2b8b303bfbfc9c94497a62bd2cee0741251c754a Mon Sep 17 00:00:00 2001 From: zj <1052308357@qq.com> Date: Wed, 26 Nov 2025 15:53:18 +0800 Subject: [PATCH] remove lts --- .../loader/entries/01-archiso-x86_64-linux.conf | 4 ++-- .../entries/02-archiso-x86_64-speech-linux.conf | 4 ++-- archiso/grub/grub.cfg | 8 ++++---- archiso/grub/loopback.cfg | 6 +++--- archiso/packages.x86_64 | 8 ++------ archiso/syslinux/archiso_pxe-linux.cfg | 12 ++++++------ archiso/syslinux/archiso_sys-linux.cfg | 8 ++++---- 7 files changed, 23 insertions(+), 27 deletions(-) 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 338236cf..afd8e99a 100755 --- 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 Arch Linux install medium (x86_64, UEFI) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index 79bd2533..c216f5e5 100755 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,7 +1,7 @@ title Arch Linux install medium (x86_64, UEFI) with speech sort-key 02 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 1fe97561..93aa0f16 100755 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -53,14 +53,14 @@ timeout_style=menu menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-lts archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-lts.img + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n + initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-lts archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-lts.img + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n + initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } diff --git a/archiso/grub/loopback.cfg b/archiso/grub/loopback.cfg index b6ed5c85..d7d5eced 100755 --- a/archiso/grub/loopback.cfg +++ b/archiso/grub/loopback.cfg @@ -31,13 +31,13 @@ timeout_style=menu menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-lts.img + initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux-lts archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux-lts.img + linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on + initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 30ff2ffc..450f5f08 100755 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -50,11 +50,7 @@ less lftp libfido2 libusb-compat -#linux - -linux-lts -linux-lts-headers - +linux linux-atm linux-firmware linux-firmware-marvell @@ -315,4 +311,4 @@ htop sysstat unhide gnome-disk-utility -iftop \ No newline at end of file +iftop diff --git a/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index 4f38b07d..5d0f7414 100755 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the Arch Linux install medium using NBD. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NBD) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the Arch Linux live medium using NFS. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NFS) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the Arch Linux live medium using HTTP. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, HTTP) -LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts -INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.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 acbcc855..7d3458e9 100755 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the Arch Linux install medium on BIOS. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, BIOS) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n # Accessibility boot option @@ -15,6 +15,6 @@ Boot the Arch Linux install medium on BIOS with speakup screen reader. It allows you to install Arch Linux or perform system maintenance with speech feedback. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts -INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n