From 60ca38607fac7c8104c6e2daa404e0234efb145f Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sun, 8 Apr 2018 19:00:20 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto | 24 +++++++++++++-----------
 make_mksquashfs-auto.sh     | 11 +++++------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index ec77c2a..fe26fac 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -296,6 +296,19 @@ then
     exit 0
 fi
 
+# grundinstallation
+
+gitclone
+
+if [ "$vollinstallation" != "n" ]
+then
+    check
+    if [ "$vollinstallation" != "debug" ]; then
+        standartinstallation
+    fi
+    checkend
+fi
+
 # sudoers/wheel
 
 echo "Lege $SUDOERS neu an!!!"
@@ -304,8 +317,6 @@ echo "root ALL=(ALL) NOPASSWD: ALL" > $SUDOERS
 
 echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS
 
-gitclone
-
 # Your commands
 
 # modprobe.d
@@ -344,15 +355,6 @@ if [ -f /var/lib/pacman/db.lck ];then
     rm /var/lib/pacman/db.lck
 fi
 
-if [ "$vollinstallation" != "n" ]
-then
-    check
-    if [ "$vollinstallation" != "debug" ]; then
-        standartinstallation
-    fi
-    checkend
-fi
-
 if [ "${version}" != "libre" ]; then
     #yaourtmanagerinstall
     #pacaurmanagerinstall
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 425a85f..a742d1f 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -35,9 +35,9 @@ function minimalinstallation() {
     cp mirrorlist* /etc/pacman.d/
 
     if [ "${version}" == "libre" ]; then
-        ./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
+        ./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs base git --ignore linux
     else
-        ./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
+        ./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs base git --ignore linux
     fi
 }
 
@@ -393,11 +393,10 @@ if [ "${parameter2}" != "skip" ]; then
     filesystem
 
     echo "Jetzt können sie ihr Betriebssystem nach ihren Belieben anpassen:D"
+    echo "Bitte führen sie arch-graphical-install-auto und die Version aus."
+    echo "Benutze Poweroff um das System wieder herunterzufahren und das Komprimieren zu beginnen :)"
     cp arch-graphical-install-auto ${work_dir}/${arch}/airootfs/usr/bin/arch-graphical-install-auto
-    systemd-nspawn -b -u root -D ${work_dir}/${arch}/airootfs <<EOT
-/usr/bin/arch-graphical-install-auto ${version}
-EOT
-
+    systemd-nspawn -b -D ${work_dir}/${arch}/airootfs
 fi
 
 if [ "${parameter3}" != "skip" ]; then