From 3dce9937149e0553e92f810d549d60b421f2853a Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Wed, 25 Apr 2018 10:08:07 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto | 5 -----
 make_mksquashfs-auto.sh     | 9 +++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 0fae2d0..19ed31f 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -313,11 +313,6 @@ echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS
 
 # Your commands
 
-# 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/
 chmod 755 /usr/bin/startup
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 2803575..baff1af 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -129,9 +129,14 @@ function system() {
             cp -v install/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
             cp -v hooks/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
 
+	    # modprobe.d
+	    mkdir -p ${work_dir}/${arch}/airootfs/etc/modprobe.d/
+	    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
                 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 memdisk archiso_shutdown archiso block pcmcia filesystems keyboard\"" >> ${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
 
@@ -148,7 +153,7 @@ function system() {
                 #echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
 
                 echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
-                echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso block pcmcia filesystems keyboard\"" >> ${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
                 echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf