From dfcaa080472fff9ce6f9acee313400d05fe1379c Mon Sep 17 00:00:00 2001 From: D3vil0p3r <> Date: Wed, 20 Sep 2023 09:53:08 +0200 Subject: [PATCH] Fixed -lts filenames and grub theme name --- .github/ISSUE_TEMPLATE/--bug_report.yml | 2 +- archiso/airootfs/etc/default/grub | 2 +- archiso/airootfs/etc/mkinitcpio.d/athena | 8 +++--- .../airootfs/etc/mkinitcpio.d/linux.preset | 6 ++--- .../entries/01-archiso-x86_64-linux.conf | 4 +-- .../02-archiso-x86_64-linux-no-nouveau.conf | 4 +-- .../loader/entries/03-nvidianouveau.conf | 4 +-- .../loader/entries/04-nvidianonouveau.conf | 4 +-- .../efiboot/loader/entries/05-nomodeset.conf | 4 +-- archiso/grub/grub.cfg | 26 +++++++++---------- archiso/syslinux/archiso_pxe-linux.cfg | 12 ++++----- archiso/syslinux/archiso_sys-linux.cfg | 20 +++++++------- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/--bug_report.yml b/.github/ISSUE_TEMPLATE/--bug_report.yml index 09ff97811..7cabfbc07 100644 --- a/.github/ISSUE_TEMPLATE/--bug_report.yml +++ b/.github/ISSUE_TEMPLATE/--bug_report.yml @@ -40,7 +40,7 @@ body: description: | Please tell us what version of the Linux kernel you are using, or if you are using a custom kernel. You can run `uname -r` if that command is available to you, or by running `cat /proc/version`. - placeholder: "6.2.11-zen1-1-zen" + placeholder: "6.2.11-lts1-1-lts" validations: required: false diff --git a/archiso/airootfs/etc/default/grub b/archiso/airootfs/etc/default/grub index 5d1b133fe..9c9f9f46f 100755 --- a/archiso/airootfs/etc/default/grub +++ b/archiso/airootfs/etc/default/grub @@ -44,7 +44,7 @@ GRUB_DISABLE_RECOVERY=true # Uncomment one of them for the gfx desired, a image background or a gfxtheme GRUB_BACKGROUND="/usr/share/backgrounds/default/grub.png" -GRUB_THEME="/boot/grub/themes/athena-logo/theme.txt" +GRUB_THEME="/boot/grub/themes/athena/theme.txt" # Uncomment to get a beep at GRUB start #GRUB_INIT_TUNE="480 440 1" diff --git a/archiso/airootfs/etc/mkinitcpio.d/athena b/archiso/airootfs/etc/mkinitcpio.d/athena index 5467d5184..d26d36bae 100755 --- a/archiso/airootfs/etc/mkinitcpio.d/athena +++ b/archiso/airootfs/etc/mkinitcpio.d/athena @@ -1,14 +1,14 @@ -# mkinitcpio preset file for the 'linux-zen' package +# mkinitcpio preset file for the 'linux-lts' package ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux-zen" +ALL_kver="/boot/vmlinuz-linux-lts" PRESETS=('default' 'fallback') #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/archiso/airootfs/etc/mkinitcpio.d/linux.preset b/archiso/airootfs/etc/mkinitcpio.d/linux.preset index a2bf6e039..955420985 100755 --- a/archiso/airootfs/etc/mkinitcpio.d/linux.preset +++ b/archiso/airootfs/etc/mkinitcpio.d/linux.preset @@ -1,8 +1,8 @@ -# mkinitcpio preset file for the 'linux-zen' package on archiso +# mkinitcpio preset file for the 'linux-lts' package on archiso 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/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 8557956b9..73cab80a6 100755 --- 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 Athena OS install medium (x86_64, UEFI, open source) 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% driver=free cow_spacesize=4G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-no-nouveau.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-no-nouveau.conf index b083aff15..4b1df7519 100755 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-no-nouveau.conf +++ b/archiso/efiboot/loader/entries/02-archiso-x86_64-linux-no-nouveau.conf @@ -1,7 +1,7 @@ title Athena OS install medium (x86_64, UEFI, open source, no nouveau) sort-key 02 -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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 diff --git a/archiso/efiboot/loader/entries/03-nvidianouveau.conf b/archiso/efiboot/loader/entries/03-nvidianouveau.conf index 625735167..4c68ef4ff 100755 --- a/archiso/efiboot/loader/entries/03-nvidianouveau.conf +++ b/archiso/efiboot/loader/entries/03-nvidianouveau.conf @@ -1,7 +1,7 @@ title Athena OS install medium (x86_64, UEFI, NVIDIA) sort-key 03 -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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 diff --git a/archiso/efiboot/loader/entries/04-nvidianonouveau.conf b/archiso/efiboot/loader/entries/04-nvidianonouveau.conf index 51f056aea..340bd73fb 100644 --- a/archiso/efiboot/loader/entries/04-nvidianonouveau.conf +++ b/archiso/efiboot/loader/entries/04-nvidianonouveau.conf @@ -1,7 +1,7 @@ title Athena OS install medium (x86_64, UEFI, NVIDIA, no nouveau) sort-key 04 -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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=nonfreenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 diff --git a/archiso/efiboot/loader/entries/05-nomodeset.conf b/archiso/efiboot/loader/entries/05-nomodeset.conf index 2176c7194..a8b20c97b 100644 --- a/archiso/efiboot/loader/entries/05-nomodeset.conf +++ b/archiso/efiboot/loader/entries/05-nomodeset.conf @@ -1,7 +1,7 @@ title Athena OS install medium (x86_64, UEFI, safe graphics, nomodeset) sort-key 05 -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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 3f4f1a939..05b4f7b1b 100644 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -38,7 +38,7 @@ default=athena timeout=15 timeout_style=menu -theme="/boot/grub/themes/athena-logo/theme.txt" +theme="/boot/grub/themes/athena/theme.txt" # GRUB init tune for accessibility play 600 988 1 1319 4 @@ -48,43 +48,43 @@ play 600 988 1 1319 4 menuentry "Athena OS install medium (x86_64, UEFI, open source)" --class arch --class gnu-linux --class gnu --class os --id 'athena' { set gfxpayload=keep search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 - 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} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img } menuentry "Athena OS install medium with speakup screen reader (x86_64, UEFI, open source)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'athena-accessibility' { set gfxpayload=keep search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes accessibility=on systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 - 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} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes accessibility=on systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 + initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img } #menuentry "Athena OS install medium (x86_64, UEFI, open source, no nouveau)" --class arch --class gnu-linux --class gnu --class os --id 'athenann' { # set gfxpayload=keep # search --no-floppy --set=root --label %ARCHISO_LABEL% -# linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 -# 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} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 +# initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img #} #menuentry "Athena OS install medium (x86_64, UEFI, NVIDIA)" --class arch --class gnu-linux --class gnu --class os --id 'athenanv' { # set gfxpayload=keep # search --no-floppy --set=root --label %ARCHISO_LABEL% -# linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 -# 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} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 +# initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img #} #menuentry "Athena OS install medium (x86_64, UEFI, NVIDIA, no nouveau)" --class arch --class gnu-linux --class gnu --class os --id 'athenanvnn' { # set gfxpayload=keep # search --no-floppy --set=root --label %ARCHISO_LABEL% -# linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=nonfreenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 -# 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} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=nonfreenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 +# initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-lts.img #} #menuentry "Athena OS install medium (x86_64, UEFI, safe graphics, nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'athenanm' { # set gfxpayload=keep # search --no-floppy --set=root --label %ARCHISO_LABEL% -# linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 -# 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} archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 +# 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/archiso/syslinux/archiso_pxe-linux.cfg b/archiso/syslinux/archiso_pxe-linux.cfg index cc5cccaa4..fabf1c5c7 100755 --- a/archiso/syslinux/archiso_pxe-linux.cfg +++ b/archiso/syslinux/archiso_pxe-linux.cfg @@ -4,8 +4,8 @@ Boot the Athena OS install medium using NBD. It allows you to install Athena OS or perform system maintenance. ENDTEXT MENU LABEL Athena OS install medium (x86_64, NBD) -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% archiso_nbd_srv=${pxeserver} checksum verify copytoram=no SYSAPPEND 3 @@ -15,8 +15,8 @@ Boot the Athena OS live medium using NFS. It allows you to install Athena OS or perform system maintenance. ENDTEXT MENU LABEL Athena OS install medium (x86_64, NFS) -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% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify copytoram=no SYSAPPEND 3 @@ -26,7 +26,7 @@ Boot the Athena OS live medium using HTTP. It allows you to install Athena OS or perform system maintenance. ENDTEXT MENU LABEL Athena OS install medium (x86_64, HTTP) -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% archiso_http_srv=http://${pxeserver}/ checksum verify copytoram=no SYSAPPEND 3 diff --git a/archiso/syslinux/archiso_sys-linux.cfg b/archiso/syslinux/archiso_sys-linux.cfg index c9c9bc983..1ef66d5fa 100755 --- a/archiso/syslinux/archiso_sys-linux.cfg +++ b/archiso/syslinux/archiso_sys-linux.cfg @@ -4,8 +4,8 @@ Boot the Athena OS install medium on BIOS with open source drivers. It allows you to install Athena OS or perform system maintenance. ENDTEXT MENU LABEL Boot Athena OS (x86_64, BIOS, open source) -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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 #LABEL arch64 freenonouveau @@ -14,8 +14,8 @@ APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=4G copytoram=n archisolabel=%A #It allows you to install Athena OS or perform system maintenance. #ENDTEXT #MENU LABEL Boot Athena OS (x86_64, BIOS, open source, no nouveau) -#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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=freenonouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 #LABEL arch64 nonfree @@ -24,8 +24,8 @@ APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=4G copytoram=n archisolabel=%A #It allows you to install Athena OS or perform system maintenance. #ENDTEXT #MENU LABEL Boot Athena OS (x86_64, BIOS, NVIDIA) -#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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=nonfree nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 #LABEL arch64 nonfree nonouveau @@ -34,8 +34,8 @@ APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=4G copytoram=n archisolabel=%A #It allows you to install Athena OS or perform system maintenance. #ENDTEXT #MENU LABEL Boot Athena OS (x86_64, BIOS, NVIDIA, no nouveau) -#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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=nonfreenonouveau nouveau.modeset=0 radeon.modeset=1 i915.modeset=1 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1 LABEL arch64 nomodeset @@ -44,6 +44,6 @@ Boot the Athena OS install medium on BIOS with nomodeset. It allows you to install Athena OS or perform system maintenance. ENDTEXT MENU LABEL Boot Athena OS (x86_64, BIOS, nomodeset) -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% cow_spacesize=4G copytoram=n archisolabel=%ARCHISO_LABEL% driver=free nomodeset nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes systemd.log_level=debug systemd.log_target=console console=ttyS0,38400 console=tty1