From cacfc507c27738f8a81fff682a2b140b8ecab4f8 Mon Sep 17 00:00:00 2001 From: simono41 Date: Mon, 2 Apr 2018 04:57:34 +0200 Subject: [PATCH] nvidia-fix --- arch-install | 23 ++++++++++++-- releng/all/archiso-x86_64-cd-cinnamon.conf | 2 +- releng/all/archiso-x86_64-cd-gnome.conf | 2 +- releng/all/archiso-x86_64-cd-kde.conf | 2 +- releng/all/archiso-x86_64-cd-lxde.conf | 2 +- releng/all/archiso-x86_64-cd-lxqt.conf | 2 +- releng/all/archiso-x86_64-cd-mate.conf | 2 +- releng/all/archiso-x86_64-cd-xfce4.conf | 2 +- releng/all/archiso-x86_64-usb-cinnamon.conf | 2 +- releng/all/archiso-x86_64-usb-gnome.conf | 2 +- releng/all/archiso-x86_64-usb-kde.conf | 2 +- releng/all/archiso-x86_64-usb-lxde.conf | 2 +- releng/all/archiso-x86_64-usb-lxqt.conf | 2 +- releng/all/archiso-x86_64-usb-mate.conf | 2 +- releng/all/archiso-x86_64-usb-xfce4.conf | 2 +- .../archiso-x86_64-cd-default-checksum.conf | 2 +- releng/archiso-x86_64-cd-default-nvidia.conf | 6 ++-- releng/archiso-x86_64-cd-default.conf | 2 +- ...hiso-x86_64-cd-default_noimage-format.conf | 0 ...chiso-x86_64-cd-default_noimage-toram.conf | 2 +- releng/archiso-x86_64-cd-default_noimage.conf | 2 +- releng/archiso-x86_64-cd-default_toram.conf | 2 +- .../archiso-x86_64-usb-default-checksum.conf | 2 +- releng/archiso-x86_64-usb-default-nvidia.conf | 6 ++-- releng/archiso-x86_64-usb-default.conf | 2 +- ...iso-x86_64-usb-default_noimage-format.conf | 0 ...hiso-x86_64-usb-default_noimage-toram.conf | 2 +- .../archiso-x86_64-usb-default_noimage.conf | 2 +- releng/archiso-x86_64-usb-default_toram.conf | 2 +- syslinux-noimage.cfg | 2 +- syslinux-standart.cfg | 16 +++++----- syslinux.cfg | 30 +++++++++---------- 32 files changed, 74 insertions(+), 57 deletions(-) mode change 100755 => 100644 releng/all/archiso-x86_64-cd-cinnamon.conf mode change 100755 => 100644 releng/all/archiso-x86_64-cd-gnome.conf mode change 100755 => 100644 releng/all/archiso-x86_64-cd-kde.conf mode change 100755 => 100644 releng/all/archiso-x86_64-cd-lxde.conf mode change 100755 => 100644 releng/all/archiso-x86_64-cd-lxqt.conf mode change 100755 => 100644 releng/all/archiso-x86_64-cd-mate.conf mode change 100755 => 100644 releng/all/archiso-x86_64-cd-xfce4.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-cinnamon.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-gnome.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-kde.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-lxde.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-lxqt.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-mate.conf mode change 100755 => 100644 releng/all/archiso-x86_64-usb-xfce4.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default-checksum.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default-nvidia.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default_noimage-format.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default_noimage-toram.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default_noimage.conf mode change 100755 => 100644 releng/archiso-x86_64-cd-default_toram.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default-checksum.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default-nvidia.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default_noimage-format.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default_noimage-toram.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default_noimage.conf mode change 100755 => 100644 releng/archiso-x86_64-usb-default_toram.conf mode change 100755 => 100644 syslinux-noimage.cfg mode change 100755 => 100644 syslinux-standart.cfg mode change 100755 => 100644 syslinux.cfg diff --git a/arch-install b/arch-install index d050d63..4ff8d87 100755 --- a/arch-install +++ b/arch-install @@ -645,14 +645,28 @@ function systemdboot() { echo "linux /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "initrd /initramfs-linux.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf - echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf + echo "options root=${tobootdevice} rw ${parameter}quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf echo "title "${repo}"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "linux /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf echo "initrd /initramfs-linux-fallback.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf - echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf + echo "options root=${tobootdevice} rw ${parameter}quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf + if [ "${version}" != "libre" ]; then + echo "title "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf + echo "linux /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf + echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf + echo "initrd /initramfs-linux-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf + echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf + + echo "title "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf + echo "linux /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf + echo "initrd /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf + echo "initrd /initramfs-linux-fallback-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf + echo "options root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf + + fi echo "default arch-uefi" > ${mountpoint}/boot/loader/loader.conf echo "timeout 1" >> ${mountpoint}/boot/loader/loader.conf @@ -662,8 +676,11 @@ function systemdboot() { arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l /EFI/systemd/systemd-bootx64.efi -L "Linux Boot Manager" - arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux efistub" -u "initrd=/initramfs-linux.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" + arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux efistub" -u "initrd=/initramfs-linux.img root=${tobootdevice} rw ${parameter}quiet splash" + if [ "${version}" != "libre" ]; then + arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux-lts -L "Arch Linux efistub" -u "initrd=/initramfs-linux-lts.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" + fi # überschreibt die efistub deswegen entfernt #arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux fallback efistub" -u "initrd=/initramfs-linux-fallback.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" diff --git a/releng/all/archiso-x86_64-cd-cinnamon.conf b/releng/all/archiso-x86_64-cd-cinnamon.conf old mode 100755 new mode 100644 index 55e2e93..94af7f7 --- a/releng/all/archiso-x86_64-cd-cinnamon.conf +++ b/releng/all/archiso-x86_64-cd-cinnamon.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT CINNAMON linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon quiet splash diff --git a/releng/all/archiso-x86_64-cd-gnome.conf b/releng/all/archiso-x86_64-cd-gnome.conf old mode 100755 new mode 100644 index c1040f7..1431bfa --- a/releng/all/archiso-x86_64-cd-gnome.conf +++ b/releng/all/archiso-x86_64-cd-gnome.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT GNOME linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome quiet splash diff --git a/releng/all/archiso-x86_64-cd-kde.conf b/releng/all/archiso-x86_64-cd-kde.conf old mode 100755 new mode 100644 index 6d8e559..d30beba --- a/releng/all/archiso-x86_64-cd-kde.conf +++ b/releng/all/archiso-x86_64-cd-kde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT KDE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde quiet splash diff --git a/releng/all/archiso-x86_64-cd-lxde.conf b/releng/all/archiso-x86_64-cd-lxde.conf old mode 100755 new mode 100644 index 35b9b10..1ed4080 --- a/releng/all/archiso-x86_64-cd-lxde.conf +++ b/releng/all/archiso-x86_64-cd-lxde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT LXDE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde quiet splash diff --git a/releng/all/archiso-x86_64-cd-lxqt.conf b/releng/all/archiso-x86_64-cd-lxqt.conf old mode 100755 new mode 100644 index f0d109d..9bcd325 --- a/releng/all/archiso-x86_64-cd-lxqt.conf +++ b/releng/all/archiso-x86_64-cd-lxqt.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT LXQT linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt quiet splash diff --git a/releng/all/archiso-x86_64-cd-mate.conf b/releng/all/archiso-x86_64-cd-mate.conf old mode 100755 new mode 100644 index 84082d1..bf7ddd3 --- a/releng/all/archiso-x86_64-cd-mate.conf +++ b/releng/all/archiso-x86_64-cd-mate.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT MATE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate quiet splash diff --git a/releng/all/archiso-x86_64-cd-xfce4.conf b/releng/all/archiso-x86_64-cd-xfce4.conf old mode 100755 new mode 100644 index 223a782..85a6582 --- a/releng/all/archiso-x86_64-cd-xfce4.conf +++ b/releng/all/archiso-x86_64-cd-xfce4.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT XFCE4 linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 quiet splash diff --git a/releng/all/archiso-x86_64-usb-cinnamon.conf b/releng/all/archiso-x86_64-usb-cinnamon.conf old mode 100755 new mode 100644 index 70ab1d3..7f62421 --- a/releng/all/archiso-x86_64-usb-cinnamon.conf +++ b/releng/all/archiso-x86_64-usb-cinnamon.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT CINNAMON linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon quiet splash diff --git a/releng/all/archiso-x86_64-usb-gnome.conf b/releng/all/archiso-x86_64-usb-gnome.conf old mode 100755 new mode 100644 index 8739389..69a9363 --- a/releng/all/archiso-x86_64-usb-gnome.conf +++ b/releng/all/archiso-x86_64-usb-gnome.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT GNOME linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome quiet splash diff --git a/releng/all/archiso-x86_64-usb-kde.conf b/releng/all/archiso-x86_64-usb-kde.conf old mode 100755 new mode 100644 index 5ee68d0..b041911 --- a/releng/all/archiso-x86_64-usb-kde.conf +++ b/releng/all/archiso-x86_64-usb-kde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT KDE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde quiet splash diff --git a/releng/all/archiso-x86_64-usb-lxde.conf b/releng/all/archiso-x86_64-usb-lxde.conf old mode 100755 new mode 100644 index 35df4de..927d6bc --- a/releng/all/archiso-x86_64-usb-lxde.conf +++ b/releng/all/archiso-x86_64-usb-lxde.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT LXDE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde quiet splash diff --git a/releng/all/archiso-x86_64-usb-lxqt.conf b/releng/all/archiso-x86_64-usb-lxqt.conf old mode 100755 new mode 100644 index 4d4882a..b433d32 --- a/releng/all/archiso-x86_64-usb-lxqt.conf +++ b/releng/all/archiso-x86_64-usb-lxqt.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT LXQT linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt quiet splash diff --git a/releng/all/archiso-x86_64-usb-mate.conf b/releng/all/archiso-x86_64-usb-mate.conf old mode 100755 new mode 100644 index 2b34228..bb6be51 --- a/releng/all/archiso-x86_64-usb-mate.conf +++ b/releng/all/archiso-x86_64-usb-mate.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT MATE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate quiet splash diff --git a/releng/all/archiso-x86_64-usb-xfce4.conf b/releng/all/archiso-x86_64-usb-xfce4.conf old mode 100755 new mode 100644 index 4a858bd..0039801 --- a/releng/all/archiso-x86_64-usb-xfce4.conf +++ b/releng/all/archiso-x86_64-usb-xfce4.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT XFCE4 linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 quiet splash diff --git a/releng/archiso-x86_64-cd-default-checksum.conf b/releng/archiso-x86_64-cd-default-checksum.conf old mode 100755 new mode 100644 index 5091a70..18275a9 --- a/releng/archiso-x86_64-cd-default-checksum.conf +++ b/releng/archiso-x86_64-cd-default-checksum.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT Check disc for defects linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash diff --git a/releng/archiso-x86_64-cd-default-nvidia.conf b/releng/archiso-x86_64-cd-default-nvidia.conf old mode 100755 new mode 100644 index 12143bd..4034ad8 --- a/releng/archiso-x86_64-cd-default-nvidia.conf +++ b/releng/archiso-x86_64-cd-default-nvidia.conf @@ -1,5 +1,5 @@ # default title %ISO_LABEL% %arch% UEFI DVD DEFAULT NVIDIA -linux /EFI/archiso/vmlinuz.efi -initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash +linux /EFI/archiso/vmlinuz-lts.efi +initrd /EFI/archiso/archiso-lts.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash diff --git a/releng/archiso-x86_64-cd-default.conf b/releng/archiso-x86_64-cd-default.conf old mode 100755 new mode 100644 index d1044b9..217557f --- a/releng/archiso-x86_64-cd-default.conf +++ b/releng/archiso-x86_64-cd-default.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash diff --git a/releng/archiso-x86_64-cd-default_noimage-format.conf b/releng/archiso-x86_64-cd-default_noimage-format.conf old mode 100755 new mode 100644 diff --git a/releng/archiso-x86_64-cd-default_noimage-toram.conf b/releng/archiso-x86_64-cd-default_noimage-toram.conf old mode 100755 new mode 100644 index 453fb3f..95f20fa --- a/releng/archiso-x86_64-cd-default_noimage-toram.conf +++ b/releng/archiso-x86_64-cd-default_noimage-toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT NOIMAGE TORAM linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash diff --git a/releng/archiso-x86_64-cd-default_noimage.conf b/releng/archiso-x86_64-cd-default_noimage.conf old mode 100755 new mode 100644 index a5f71ac..b0b4643 --- a/releng/archiso-x86_64-cd-default_noimage.conf +++ b/releng/archiso-x86_64-cd-default_noimage.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT NOIMAGE linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash diff --git a/releng/archiso-x86_64-cd-default_toram.conf b/releng/archiso-x86_64-cd-default_toram.conf old mode 100755 new mode 100644 index 3dbba5e..218b99e --- a/releng/archiso-x86_64-cd-default_toram.conf +++ b/releng/archiso-x86_64-cd-default_toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD DEFAULT TORAM linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash diff --git a/releng/archiso-x86_64-usb-default-checksum.conf b/releng/archiso-x86_64-usb-default-checksum.conf old mode 100755 new mode 100644 index 6ec4691..f372375 --- a/releng/archiso-x86_64-usb-default-checksum.conf +++ b/releng/archiso-x86_64-usb-default-checksum.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT Check disc for defects linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash diff --git a/releng/archiso-x86_64-usb-default-nvidia.conf b/releng/archiso-x86_64-usb-default-nvidia.conf old mode 100755 new mode 100644 index 71d5472..09dba45 --- a/releng/archiso-x86_64-usb-default-nvidia.conf +++ b/releng/archiso-x86_64-usb-default-nvidia.conf @@ -1,5 +1,5 @@ # default title %ISO_LABEL% %arch% UEFI USB DEFAULT NVIDIA -linux /%INSTALL_DIR%/boot/%arch%/vmlinuz -initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash +linux /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts +initrd /%INSTALL_DIR%/boot/%arch%/archiso-lts.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash diff --git a/releng/archiso-x86_64-usb-default.conf b/releng/archiso-x86_64-usb-default.conf old mode 100755 new mode 100644 index c05438e..f34d854 --- a/releng/archiso-x86_64-usb-default.conf +++ b/releng/archiso-x86_64-usb-default.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash diff --git a/releng/archiso-x86_64-usb-default_noimage-format.conf b/releng/archiso-x86_64-usb-default_noimage-format.conf old mode 100755 new mode 100644 diff --git a/releng/archiso-x86_64-usb-default_noimage-toram.conf b/releng/archiso-x86_64-usb-default_noimage-toram.conf old mode 100755 new mode 100644 index 5e6307e..ef64d16 --- a/releng/archiso-x86_64-usb-default_noimage-toram.conf +++ b/releng/archiso-x86_64-usb-default_noimage-toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT NOIMAGE TORAM linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash diff --git a/releng/archiso-x86_64-usb-default_noimage.conf b/releng/archiso-x86_64-usb-default_noimage.conf old mode 100755 new mode 100644 index 3618aa5..f724253 --- a/releng/archiso-x86_64-usb-default_noimage.conf +++ b/releng/archiso-x86_64-usb-default_noimage.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT NOIMAGE linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash diff --git a/releng/archiso-x86_64-usb-default_toram.conf b/releng/archiso-x86_64-usb-default_toram.conf old mode 100755 new mode 100644 index 47929b9..66454bb --- a/releng/archiso-x86_64-usb-default_toram.conf +++ b/releng/archiso-x86_64-usb-default_toram.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB DEFAULT TORAM linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash diff --git a/syslinux-noimage.cfg b/syslinux-noimage.cfg old mode 100755 new mode 100644 index af124be..1988de6 --- a/syslinux-noimage.cfg +++ b/syslinux-noimage.cfg @@ -3,4 +3,4 @@ LABEL arch MENU LABEL SPECTRE_OS DEFAULT NOIMAGE LINUX /arch/boot/x86_64/vmlinuz INITRD /arch/boot/x86_64/archiso.img -APPEND archisolabel=SPECTRE_OS cow_label=cow_device nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=SPECTRE_OS cow_label=cow_device quiet splash diff --git a/syslinux-standart.cfg b/syslinux-standart.cfg old mode 100755 new mode 100644 index 7a27332..69500c1 --- a/syslinux-standart.cfg +++ b/syslinux-standart.cfg @@ -3,28 +3,28 @@ LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash # default toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash # default noimage LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash # default noimage toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash # default noimage format LABEL arch @@ -36,14 +36,14 @@ APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3 # default nvidia LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NVIDIA -LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz -INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y nvidia-drm.modeset=1 quiet splash +LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts +INITRD /%INSTALL_DIR%/boot/%arch%/archiso-lts.img +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash # default checksum LABEL arch MENU LABEL %ISO_LABEL% DEFAULT Check disc for defects LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash diff --git a/syslinux.cfg b/syslinux.cfg old mode 100755 new mode 100644 index 6de4b69..2d83bda --- a/syslinux.cfg +++ b/syslinux.cfg @@ -3,77 +3,77 @@ LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M quiet splash # default Gnome LABEL arch MENU LABEL %ISO_LABEL% DEFAULT GNOME LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=gnome quiet splash # default cinnamon LABEL arch MENU LABEL %ISO_LABEL% DEFAULT CINNAMON LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=cinnamon quiet splash # default mate LABEL arch MENU LABEL %ISO_LABEL% DEFAULT MATE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=mate quiet splash # default lxde LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LXDE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxde quiet splash # default lxqt LABEL arch MENU LABEL %ISO_LABEL% DEFAULT LXQT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=lxqt quiet splash # default xfce4 LABEL arch MENU LABEL %ISO_LABEL% DEFAULT XFCE4 LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=xfce4 quiet splash # default kde LABEL arch MENU LABEL %ISO_LABEL% DEFAULT KDE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M desktop=kde quiet splash # default toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% copytoram=y cow_spacesize=1024M quiet splash # default noimage LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device quiet splash # default noimage toram LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE TORAM LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash # default noimage format LABEL arch @@ -85,14 +85,14 @@ APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3 # default nvidia LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NVIDIA -LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz -INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash +LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz-lts +INITRD /%INSTALL_DIR%/boot/%arch%/archiso-lts.img +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia=y nvidia-drm.modeset=1 quiet splash # default checksum LABEL arch MENU LABEL %ISO_LABEL% DEFAULT Check disc for defects LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y nvidia-drm.modeset=1 quiet splash +APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M checksum=y quiet splash