From ffbfda7e020fd3c65f39f8a6c9207b4778c81cc1 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 11 Nov 2017 14:47:37 +0100
Subject: [PATCH] fix

---
 Simon-OS/arch-install | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Simon-OS/arch-install b/Simon-OS/arch-install
index 44e29bb..32d842e 100755
--- a/Simon-OS/arch-install
+++ b/Simon-OS/arch-install
@@ -210,8 +210,12 @@ if [ "${verschluesselung}" == "y" ]; then
     parameter="${parameter}encrypt "
 fi
 parameter="${parameter}block filesystems keyboard "
-if [ "${dateisystem}" == "btrfs" ]; then
-    parameter="${parameter}btrfs "
+if [ "${verschluesselung}" == "y" ]; then
+    echo "btrfs-hook wird übersprungen!"
+else
+    if [ "${dateisystem}" == "btrfs" ]; then
+        parameter="${parameter}btrfs "
+    fi
 fi
 if [ "${usbsecret}" == "y" ]; then
     parameter="${parameter}usbsecret "
@@ -509,7 +513,7 @@ swappartitionpart=$(blkid -s PARTUUID -o value ${device}${swappartitionnummer})
 # zurücksetzen der parameter
 parameter=""
 
-if [ "${swap}" == "y" ]; then
+if [ "${swap}" != "n" ]; then
     parameter="${parameter}resume=PARTUUID=${swappartitionpart} "
 fi
 if [ "${verschluesselung}" == "y" ]; then
@@ -646,7 +650,9 @@ if [ "${update}" != "n" ]; then
     fi
 fi
 
-read -p "Soll die Festplatte verschlüsselt werden? : [y/N] " verschluesselung
+if [ "${raid}" == "n" ]; then
+    read -p "Soll die Festplatte verschlüsselt werden? : [y/N] " verschluesselung
+fi
 
 # berechnungen