final-fix

Simon-OS/arch-install

@@ -255,12 +255,19 @@ if [ "${dateisystem}" == "btrfs" ]; then
     btrfsfstab #btrfs
 
     mkdir -p ${mountpoint}/run/btrfs-root
+    if [ "${verschluesselung}" == "y" ]; then
+        if [ "${Partition}" == "gpt" ]; then
+            echo "${deviceluks} /run/btrfs-root/ btrfs defaults 0 0" >> ${mountpoint}/etc/fstab #btrfs
+        elif [ "${Partition}" == "mbr" ]; then
+            echo "${deviceluks} /run/btrfs-root/ btrfs defaults 0 0" >> ${mountpoint}/etc/fstab #btrfs
+        fi
+    else
         if [ "${Partition}" == "gpt" ]; then
             echo "PARTUUID=${rootbind} /run/btrfs-root/ btrfs defaults 0 0" >> ${mountpoint}/etc/fstab #btrfs
         elif [ "${Partition}" == "mbr" ]; then
             echo "UUID=${rootbind} /run/btrfs-root/ btrfs defaults 0 0" >> ${mountpoint}/etc/fstab #btrfs
         fi
-
+    fi
     #grep -v "/var/lib" < ${mountpoint}/etc/fstab > fstab.neu; mv fstab.neu ${mountpoint}/etc/fstab
 
     echo "/run/btrfs-root/__current/ROOT/var/lib /var/lib none bind 0 0" >> ${mountpoint}/etc/fstab #btrfs
@@ -268,12 +275,20 @@ if [ "${dateisystem}" == "btrfs" ]; then
     cron
 
 elif [ "${dateisystem}" == "ext4" ]; then
+    if [ "${verschluesselung}" == "y" ]; then
+        if [ "${Partition}" == "gpt" ]; then
+            echo "${deviceluks} / ext4 rw,defaults,noatime,nodiratime,discard 0 0" >> ${mountpoint}/etc/fstab
+        elif [ "${Partition}" == "mbr" ]; then
+            echo "${deviceluks} / ext4 rw,defaults,noatime,nodiratime,discard 0 0" >> ${mountpoint}/etc/fstab
+        fi
+    else
         if [ "${Partition}" == "gpt" ]; then
             echo "PARTUUID=${rootbind} / ext4 rw,defaults,noatime,nodiratime,discard 0 0" >> ${mountpoint}/etc/fstab
         elif [ "${Partition}" == "mbr" ]; then
             echo "UUID=${rootbind} / ext4 rw,defaults,noatime,nodiratime,discard 0 0" >> ${mountpoint}/etc/fstab
         fi
     fi
+fi
 
 if [ "${Partition}" == "gpt" ]; then
 
@@ -320,6 +335,7 @@ if [ "${verschluesselung}" == "y" ]; then
     if [ "${boot}" == "grub" ]; then
         tobootdevice=$(blkid -s UUID -o value ${device}${rootpartitionnummer})
         sed -i 's/GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX="cryptdevice=UUID='$tobootdevice':luks0"/' ${mountpoint}/etc/default/grub
+        echo "GRUB_ENABLE_CRYPTODISK=y" >> ${mountpoint}/etc/default/grub
     fi
 fi
 
@@ -381,6 +397,40 @@ elif [ "${Partition}" == "mbr" ]; then
     rootbind=$(blkid -s UUID -o value ${device}${rootpartitionnummer})
 fi
 
+if [ "${verschluesselung}" == "y" ]; then
+
+    if [ "${Partition}" == "gpt" ]; then
+
+        echo -e "${deviceluks} / btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/ROOT 0 0" >> ${mountpoint}/etc/fstab
+
+        echo -e "${deviceluks} /home btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/home 0 0" >> ${mountpoint}/etc/fstab
+        echo -e "${deviceluks} /opt btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/opt 0 0" >> ${mountpoint}/etc/fstab
+        echo -e "${deviceluks} /var/cache/pacman/pkg btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/var/cache/pacman/pkg 0 0" >> ${mountpoint}/etc/fstab
+
+        # custom-mounts
+        for wort in ${mountsnaps}
+        do
+            echo -e "${deviceluks} ${wort} btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current${wort} 0 0" >> ${mountpoint}/etc/fstab
+        done
+
+
+    elif [ "${Partition}" == "mbr" ]; then
+
+        echo -e "UUID=${rootbind} / btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/ROOT 0 0" >> ${mountpoint}/etc/fstab
+
+        echo -e "UUID=${rootbind} /home btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/home 0 0" >> ${mountpoint}/etc/fstab
+        echo -e "UUID=${rootbind} /opt btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/opt 0 0" >> ${mountpoint}/etc/fstab
+        echo -e "UUID=${rootbind} /var/cache/pacman/pkg btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/var/cache/pacman/pkg 0 0" >> ${mountpoint}/etc/fstab
+
+        # custom-mounts
+        for wort in ${mountsnaps}
+        do
+            echo -e "UUID=${rootbind} ${wort} btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current${wort} 0 0" >> ${mountpoint}/etc/fstab
+        done
+    fi
+
+else
+
     if [ "${Partition}" == "gpt" ]; then
 
         echo -e "PARTUUID=${rootbind} / btrfs rw,noatime,nodiratime,space_cache,discard,ssd,compress=lzo,subvol=__current/ROOT 0 0" >> ${mountpoint}/etc/fstab
@@ -412,6 +462,7 @@ elif [ "${Partition}" == "mbr" ]; then
 
     fi
 
+fi
 }
 
 function btrfsmount() {
@@ -910,7 +961,7 @@ if [ "${dateisystem}" == "btrfs" ]; then
 btrfs filesystem df ${mountpoint}
 fi
 echo "umount!!!"
-pause 5
+sleep 5
 secureumount
 echo ""
 echo "Fertig!!!"