From c0b3e9336e5d37dcd4c915497c3946c564e92a19 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Mon, 27 Aug 2018 14:19:16 +0200
Subject: [PATCH] nvidia-activiate

---
 arch-install            | 23 ++++++++++++++++-------
 make_mksquashfs-auto.sh |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/arch-install b/arch-install
index d6f8edd..f8c6cb6 100755
--- a/arch-install
+++ b/arch-install
@@ -11,7 +11,7 @@ user="user1"
 hostname="$(cat /etc/hostname)"
 [[ -z "${version}" ]] && version="${hostname#*-}"
 
-#fastinstall arch-install fastinstall ${name} ${Partition} ${boot} ${device} ${dateisystem} ${raid} ${swap} ${swapspeicher} ${swapverschluesselung} ${offline} ${autodisk} ${autodiskdevice} ${autostart} ${verschluesselung} ${usbkey} ${usbkeydevice} ${x11vnc} ${extraparameter} ${skipcheck}
+#fastinstall arch-install fastinstall ${name} ${Partition} ${boot} ${device} ${dateisystem} ${raid} ${swap} ${swapspeicher} ${swapverschluesselung} ${offline} ${autodisk} ${autodiskdevice} ${autostart} ${verschluesselung} ${usbkey} ${usbkeydevice} ${x11vnc} ${extraparameter} ${skipcheck} ${nvidia}
 
 
 
@@ -396,11 +396,12 @@ function installation {
     fi
 
     # module and hooks
-    parameter="base udev "
+    parameter="systemd "
+    #parameter="base udev "
 
-    if [ "${swap}" != "n" ]; then
-        parameter="${parameter}resume "
-    fi
+    #if [ "${swap}" != "n" ]; then
+    #    parameter="${parameter}resume "
+    #fi
 
     if [ "${verschluesselung}" == "y" ]; then
         parameter="${parameter}encrypt "
@@ -430,8 +431,8 @@ function installation {
     fi
 
     echo ""
-    if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then
-        echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
+    if [ "${version}" == "libre" ] || [ "${version}" == "lite" ] || [ "${nvidia}" == "n" ]; 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
         echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
@@ -879,6 +880,8 @@ function abfrage() {
 
         [[ -z "${autodiskdevice}" ]] && autodiskdevice=/dev/sdb1
 
+        [[ -z "${nvidia}" ]] && nvidia=n
+
         if [ "${offline}" != "n" ]
         then
             install="offline"
@@ -1020,6 +1023,12 @@ function abfrage() {
             [[ -z "${autostart}" ]] && autostart=n
         fi
 
+        if lspci | grep -e VGA -e 3D -m 1 | grep NVIDIA; then
+            read -p "Will you have activate youre Nvidia driver? : [y/N] " nvidia
+        fi
+        [[ -z "${nvidia}" ]] && nvidia=n
+
+
         echo "Windows dualboot funktioniert nur im UEFI Modus und auch nur derzeit mit GRUB!!!"
         echo "Ausserdem muss die UEFI_Bootpartition über 256MB mindesten sein!!!"
         read -p "Do you want a extra parameter for the installation? : [skipbootpartition/noinstall/debug/windualboot/dualboot] " extraparameter
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 134ab01..4d88c27 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -149,7 +149,7 @@ function system() {
             fi
 
             if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then
-                echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+                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 archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 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