Merge branch 'master' of https://github.com/simono41/SpectreOS

arch-install

@@ -272,7 +272,7 @@ function installation {
     fi
 
     # module and hooks
-    parameter="base udev modconf "
+    parameter="base udev "
     if [ "${swap}" != "n" ]; then
         parameter="${parameter}resume "
     fi
@@ -280,8 +280,8 @@ function installation {
         parameter="${parameter}encrypt "
     fi
     parameter="${parameter}block filesystems keyboard "
-    if [ "${verschluesselung}" == "y" ]; then
-        if [ "${dateisystem}" == "btrfs" ]; then
+    if [ "${dateisystem}" == "btrfs" ]; then
+        if [ "${raid}" != "n" ]; then
             parameter="${parameter}btrfs "
         fi
     fi

make_mksquashfs-auto.sh

@@ -18,6 +18,8 @@ out_dir=out
 install_dir=arch
 version="$1"
 
+echo "Hallo Echo"
+
 # for-schleife
 for wort in "$2" "$3" "$4" "$5" "$6" "$7"
   do