From 24d9b8296468ac2761f2936d6de42928a6bbabb0 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Tue, 21 Aug 2018 23:39:53 +0200
Subject: [PATCH] packages

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

diff --git a/arch-install b/arch-install
index 6172539..7eb872a 100755
--- a/arch-install
+++ b/arch-install
@@ -419,7 +419,7 @@ function installation {
   fi
 
   echo ""
-  if [ "${version}" == "libre" ] || [ "${version}" == "manjaro" ] || [ "${version}" == "lite" ]; then
+  if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then
     echo "MODULES=\"nouveau i915 radeon 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 8be350e..613b267 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -143,7 +143,7 @@ function system() {
             echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf
             echo "install dell-smbios /bin/false" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-dell-smbios.conf
 
-            if [ "${version}" == "libre" ] || [ "${version}" == "lite" ] || [ "${version}" == "manjaro" ]; then
+            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 "HOOKS=\"base udev 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 e9b0ffa..40628d8 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -651,6 +651,7 @@ linux-firmware
 linux316
 linux316-nvidia
 linux414
+linux414-nvidia
 lirc
 llvm-libs
 lm_sensors