From 7c65958b433cd1bfa30d12e8b2ed19d5d4b8c95f Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 7 Apr 2018 20:24:24 +0200
Subject: [PATCH] fix

---
 arch-graphical-install-auto | 10 +++++-----
 make_mksquashfs-auto.sh     |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index c717c59..64edfe1 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -344,11 +344,6 @@ if [ -f /var/lib/pacman/db.lck ];then
     rm /var/lib/pacman/db.lck
 fi
 
-# .config
-tar -vxJf /opt/${repo}/.config.tar.xz -C /root/
-gnomeconfig
-
-
 if [ "$vollinstallation" != "n" ]
 then
     check
@@ -372,6 +367,11 @@ fi
 
 echo "Packetliste2 Ende"
 echo "Beginne mit dem Konfigurieren des Systems :D"
+
+# .config
+tar -vxJf /opt/${repo}/.config.tar.xz -C /root/
+gnomeconfig
+
 # set desktop
 echo "set desktop"
 #
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 70c4721..2c489fb 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -18,6 +18,8 @@ parameter1="$2"
 parameter2="$3"
 parameter3="$4"
 parameter4="$5"
+parameter5="$6"
+parameter6="$7"
 
 arch=$(uname -m)
 
@@ -404,6 +406,7 @@ if [ "${parameter3}" != "skip" ]; then
 
 fi
 
+if [ "${parameter4}" != "skip" ]; then
 # BIOS
 
 BIOS
@@ -411,10 +414,13 @@ BIOS
 # EFI
 
 UEFI
+fi
 
+if [ "${parameter5}" != "skip" ]; then
 # MAKEISO
 
 makeiso
+fi
 
 # chroot