From 68eabd8c287107ba68eabaee1e4fc1334dab2cc8 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Thu, 3 May 2018 14:47:08 +0200
Subject: [PATCH] nvidia-fix

---
 arch-install            | 2 +-
 make_mksquashfs-auto.sh | 2 +-
 packages_manjaro.txt    | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/arch-install b/arch-install
index 1fceaa4..6c67fe9 100755
--- a/arch-install
+++ b/arch-install
@@ -309,7 +309,7 @@ function installation {
     fi
 
     echo ""
-    if [ "${version}" == "libre" ] || [ "${offline}" == "n" ]; then
+    if [ "${version}" == "libre" ] || [ "${offline}" == "n" ] || [ "${version}" == "manjaro" ]; then
         echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
         echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
         echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index a1dc22a..8fd40cd 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -128,7 +128,7 @@ function system() {
             echo "blacklist floppy" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-floppy.conf
             echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf
 
-            if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then
+            if [ "${version}" == "libre" ] || [ "${version}" == "lite" ] || [ "${version}" == "manjaro" ]; then
                 echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "HOOKS=\"base udev plymouth archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
diff --git a/packages_manjaro.txt b/packages_manjaro.txt
index b1e7882..40227a8 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -336,8 +336,6 @@ lib32-mesa
 lib32-mesa-demos
 lib32-mesa-vdpau
 lib32-ncurses
-lib32-nvidia-libgl
-lib32-opencl-nvidia
 lib32-pcre
 lib32-readline
 lib32-systemd
@@ -675,12 +673,7 @@ nss-mdns
 ntfs-3g
 ntp
 numlockx
-nvidia
-nvidia-libgl
-nvidia-settings
-nvidia-utils
 openal
-opencl-nvidia
 openconnect
 opencore-amr
 openexr