From f4dc6276d0d406d96aafd89dfa3dae5e0e90c11a 2019-10-24 20:23:54
From: burnbabyburn <2515038+burnbabyburn@users.noreply.github.com>
Date: 2019-10-24 20:23:54
Subject: [PATCH] order of code elements
---

diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index a8c521f..9134da1 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -1,4 +1,4 @@
-#
+#!/bin/sh
 # Setup fstab and initramfs
 #
 
@@ -13,21 +13,6 @@ if [ "$ENABLE_SPLITFS" = true ] && [ "$ENABLE_CRYPTFS" = false ] ; then
   sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/fstab"
 fi
 
-# Add encrypted root partition to fstab and crypttab
-if [ "$ENABLE_CRYPTFS" = true ] ; then
-  # Replace fstab root partition with encrypted partition mapping
-  sed -i "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING}/" "${ETC_DIR}/fstab"
-
-  # Add encrypted partition to crypttab and fstab
-  install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
-  echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
-
-  if [ "$ENABLE_SPLITFS" = true ] ; then
-    # Add usb/sda1 disk to crypttab
-    sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab"
-  fi
-fi
-
 if [ "$ENABLE_USBBOOT" = true ] ; then
   sed -i "s/mmcblk0p1/sda1/" "${ETC_DIR}/fstab"
   sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
@@ -39,64 +24,83 @@ fi
 # Generate initramfs file
 if [ "$ENABLE_INITRAMFS" = true ] ; then
   if [ "$ENABLE_CRYPTFS" = true ] ; then
+    if [ "$ENABLE_USBBOOT" = true ] ; then
+      # Add usb/sda2 disk to crypttab
+      sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
+    fi
+    
     # Include initramfs scripts to auto expand encrypted root partition
     if [ "$EXPANDROOT" = true ] ; then
       install_exec files/initramfs/expand_encrypted_rootfs "${ETC_DIR}/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs"
       install_exec files/initramfs/expand-premount "${ETC_DIR}/initramfs-tools/scripts/local-premount/expand-premount"
       install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"
     fi
-	
-	if [ "$ENABLE_DHCP" = false ] ; then
-      # Get cdir from NET_ADDRESS e.g. 24
-      cdir=$(printf ${NET_ADDRESS} | cut -d '/' -f2)
-
-      # Convert cdir ro netmask e.g. 24 to 255.255.255.0
-      NET_MASK=$(cdr2mask "$cdir")
-	
-	  # Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
-      sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
-
-	  # Regenerate initramfs
-	  chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
+    
+    # Replace fstab root partition with encrypted partition mapping
+    sed -i "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING}/" "${ETC_DIR}/fstab"
+
+    # Add encrypted partition to crypttab and fstab
+    install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
+    echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
+    
+    # Add encrypted root partition to fstab and crypttab
+    if [ "$ENABLE_SPLITFS" = true ] ; then
+      # Add usb/sda1 disk to crypttab
+      sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab"
     fi
 
-	if [ "$CRYPTFS_DROPBEAR" = true ]; then
-	  if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
- 	    install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
- 	    cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub >> "${ETC_DIR}"/dropbear-initramfs/authorized_keys
- 	  else
- 	    # Create key
- 	    chroot_exec /usr/bin/dropbearkey -t rsa -f /etc/dropbear-initramfs/id_rsa.dropbear
-
- 	    # Convert dropbear key to openssh key
- 	    chroot_exec /usr/lib/dropbear/dropbearconvert dropbear openssh /etc/dropbear-initramfs/id_rsa.dropbear /etc/dropbear-initramfs/id_rsa
-
- 	    # Get Public Key Part
- 	    chroot_exec /usr/bin/dropbearkey -y -f /etc/dropbear-initramfs/id_rsa.dropbear | chroot_exec tee /etc/dropbear-initramfs/id_rsa.pub
-
- 	    # Delete unwanted lines
- 	    sed -i '/Public/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
- 	    sed -i '/Fingerprint/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
-
- 	    # Trust the new key
- 	    cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub > "${ETC_DIR}"/dropbear-initramfs/authorized_keys
+    if [ "$CRYPTFS_DROPBEAR" = true ]; then
+      if [ "$ENABLE_DHCP" = false ] ; then
+        # Get cdir from NET_ADDRESS e.g. 24
+        cdir=$(printf "%s" "${NET_ADDRESS}" | cut -d '/' -f2)
 
- 	    # Save Keys - convert with putty from rsa/openssh to puttkey
- 	    cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa
-
- 	    # Get unlock script
- 	    install_exec files/initramfs/crypt_unlock.sh "${ETC_DIR}"/initramfs-tools/hooks/crypt_unlock.sh
-
- 	    # Enable Dropbear inside initramfs
- 	    printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=y\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
-
- 	    # Enable Dropbear inside initramfs
- 	    sed -i "54 i sleep 5" "${R}"/usr/share/initramfs-tools/scripts/init-premount/dropbear	  
-	  fi
-	else
-	  # Disable SSHD inside initramfs
-	  printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
-	fi
+        # Convert cdir ro netmask e.g. 24 to 255.255.255.0
+        NET_MASK=$(cdr2mask "$cdir")
+	
+        # Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
+        sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
+
+        # Regenerate initramfs
+        #chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
+      fi
+    
+      if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
+        install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
+        cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub >> "${ETC_DIR}"/dropbear-initramfs/authorized_keys
+      else
+        # Create key
+        chroot_exec /usr/bin/dropbearkey -t rsa -f /etc/dropbear-initramfs/id_rsa.dropbear
+
+        # Convert dropbear key to openssh key
+        chroot_exec /usr/lib/dropbear/dropbearconvert dropbear openssh /etc/dropbear-initramfs/id_rsa.dropbear /etc/dropbear-initramfs/id_rsa
+
+        # Get Public Key Part
+        chroot_exec /usr/bin/dropbearkey -y -f /etc/dropbear-initramfs/id_rsa.dropbear | chroot_exec tee /etc/dropbear-initramfs/id_rsa.pub
+
+        # Delete unwanted lines
+        sed -i '/Public/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
+        sed -i '/Fingerprint/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
+
+        # Trust the new key
+        cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub > "${ETC_DIR}"/dropbear-initramfs/authorized_keys
+
+        # Save Keys - convert with putty from rsa/openssh to puttkey
+        cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa
+
+        # Get unlock script
+        install_exec files/initramfs/crypt_unlock.sh "${ETC_DIR}"/initramfs-tools/hooks/crypt_unlock.sh
+
+        # Enable Dropbear inside initramfs
+        printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=y\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
+
+        # Enable Dropbear inside initramfs
+        sed -i "54 i sleep 5" "${R}"/usr/share/initramfs-tools/scripts/init-premount/dropbear	  
+      fi
+    # CRYPTFSDROPBEAR=false
+    else
+      # Disable SSHD inside initramfs
+      printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
+    fi
 
     # Add cryptsetup modules to initramfs
     printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
@@ -109,6 +113,7 @@ if [ "$ENABLE_INITRAMFS" = true ] ; then
 
     # Remove dummy mapping
     chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
+  # CRYPTFS=false
   else
     # Generate initramfs without encrypted root partition support
     chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"