From 104e8fcf2d740a916cef0d60c6f76ca8221bd08d Mon Sep 17 00:00:00 2001 From: simono41 Date: Mon, 2 Apr 2018 05:33:24 +0200 Subject: [PATCH] nvidia-fix --- releng/archiso-x86_64-cd-default_noimage-format.conf | 2 +- releng/archiso-x86_64-usb-default_noimage-format.conf | 2 +- startup | 6 +----- syslinux-standart.cfg | 2 +- syslinux.cfg | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/releng/archiso-x86_64-cd-default_noimage-format.conf b/releng/archiso-x86_64-cd-default_noimage-format.conf index abd7764..683e236 100644 --- a/releng/archiso-x86_64-cd-default_noimage-format.conf +++ b/releng/archiso-x86_64-cd-default_noimage-format.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI DVD NOIMAGE FORMAT linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M format=y formatdevice=/dev/sda formatpartition=3 nvidia-drm.modeset=1 +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M format=y formatdevice=/dev/sda formatpartition=3 diff --git a/releng/archiso-x86_64-usb-default_noimage-format.conf b/releng/archiso-x86_64-usb-default_noimage-format.conf index 3108ff6..c90765c 100644 --- a/releng/archiso-x86_64-usb-default_noimage-format.conf +++ b/releng/archiso-x86_64-usb-default_noimage-format.conf @@ -2,4 +2,4 @@ title %ISO_LABEL% %arch% UEFI USB NOIMAGE FORMAT linux /%INSTALL_DIR%/boot/%arch%/vmlinuz initrd /%INSTALL_DIR%/boot/%arch%/archiso.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M format=y formatdevice=/dev/sda formatpartition=3 nvidia-drm.modeset=1 +options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M format=y formatdevice=/dev/sda formatpartition=3 diff --git a/startup b/startup index 8f58170..85469cc 100755 --- a/startup +++ b/startup @@ -24,11 +24,7 @@ if cat /proc/cmdline | grep "nvidia=y"; then mkdir -p -m 755 /etc/X11/xorg.conf.d/ - echo "Section \"Device\"" > /etc/X11/xorg.conf - echo " Identifier \"Device0\"" >> /etc/X11/xorg.conf - echo " Driver \"nvidia\"" >> /etc/X11/xorg.conf - echo " VendorName \"NVIDIA Corporation\"" >> /etc/X11/xorg.conf - echo "EndSection" >> /etc/X11/xorg.conf + nvidia-xconfig fi diff --git a/syslinux-standart.cfg b/syslinux-standart.cfg index 69500c1..47aeeaf 100644 --- a/syslinux-standart.cfg +++ b/syslinux-standart.cfg @@ -31,7 +31,7 @@ LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE FORMAT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3 nvidia-drm.modeset=1 +APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3 # default nvidia LABEL arch diff --git a/syslinux.cfg b/syslinux.cfg index 2d83bda..024168c 100644 --- a/syslinux.cfg +++ b/syslinux.cfg @@ -80,7 +80,7 @@ LABEL arch MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE FORMAT LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img -APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3 nvidia-drm.modeset=1 +APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3 # default nvidia LABEL arch