From 2df801d1f9e3770298ce6fa9698541c60f4db4ba Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Mon, 2 Apr 2018 04:14:38 +0200
Subject: [PATCH] nvidia-fix

---
 arch-graphical-install-auto | 1 +
 arch-install                | 3 ++-
 make_mksquashfs-auto.sh     | 2 +-
 packages_cinnamon.txt       | 1 +
 packages_gnome.txt          | 1 +
 packages_kde.txt            | 1 +
 packages_libre.txt          | 1 +
 packages_lxde.txt           | 1 +
 packages_lxqt.txt           | 1 +
 packages_mate.txt           | 1 +
 packages_voll.txt           | 1 +
 packages_xfce4.txt          | 1 +
 12 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index a5b71a1..0365df7 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -311,6 +311,7 @@ gitclone
 # modprobe.d
 mkdir -p /etc/modprobe.d/
 echo "blacklist floppy" > /etc/modprobe.d/blacklist-floppy.conf
+echo "blacklist nouveau" > /etc/modprobe.d/blacklist_nouveau.conf
 
 # startup
 cp /opt/${repo}/startup /usr/bin/
diff --git a/arch-install b/arch-install
index 0c3f6b0..2061c08 100755
--- a/arch-install
+++ b/arch-install
@@ -293,9 +293,10 @@ function installation {
     fi
     echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
     echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf
-    echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
+    echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
     echo ""
     echo "blacklist floppy" > ${mountpoint}/etc/modprobe.d/blacklist-floppy.conf
+    echo "blacklist nouveau" > ${mountpoint}/etc/modprobe.d/blacklist_nouveau.conf
     echo "tmpfs /tmp tmpfs defaults 0 0" > ${mountpoint}/etc/fstab
     echo "tmpfs /dev/shm tmpfs defaults 0 0" >> ${mountpoint}/etc/fstab
 
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 3de463f..7cff82f 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -101,7 +101,7 @@ function filesystem() {
             echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard cow_device\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
         fi
         echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
-        echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+        echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
 
         # hooks
         cp -v install/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
diff --git a/packages_cinnamon.txt b/packages_cinnamon.txt
index 3763a8a..4c640f5 100644
--- a/packages_cinnamon.txt
+++ b/packages_cinnamon.txt
@@ -90,6 +90,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard
diff --git a/packages_gnome.txt b/packages_gnome.txt
index a73676c..d4d0d43 100644
--- a/packages_gnome.txt
+++ b/packages_gnome.txt
@@ -89,6 +89,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard
diff --git a/packages_kde.txt b/packages_kde.txt
index add00c4..696f8bf 100644
--- a/packages_kde.txt
+++ b/packages_kde.txt
@@ -87,6 +87,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard
diff --git a/packages_libre.txt b/packages_libre.txt
index 1567275..d5327f5 100644
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -80,6 +80,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 opencl-nvidia
diff --git a/packages_lxde.txt b/packages_lxde.txt
index 463215a..5406b19 100644
--- a/packages_lxde.txt
+++ b/packages_lxde.txt
@@ -85,6 +85,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard
diff --git a/packages_lxqt.txt b/packages_lxqt.txt
index e560e45..d24b794 100644
--- a/packages_lxqt.txt
+++ b/packages_lxqt.txt
@@ -87,6 +87,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard
diff --git a/packages_mate.txt b/packages_mate.txt
index 51b5462..37829a2 100644
--- a/packages_mate.txt
+++ b/packages_mate.txt
@@ -87,6 +87,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard
diff --git a/packages_voll.txt b/packages_voll.txt
index 0b27719..f6be40c 100644
--- a/packages_voll.txt
+++ b/packages_voll.txt
@@ -139,6 +139,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 obs-studio
diff --git a/packages_xfce4.txt b/packages_xfce4.txt
index 2e3fecb..3fbe536 100644
--- a/packages_xfce4.txt
+++ b/packages_xfce4.txt
@@ -84,6 +84,7 @@ ntfs-3g
 ntp
 nvidia-dkms
 nvidia-libgl
+nvidia-lts
 nvidia-settings
 nvidia-utils
 onboard