From 230e229698018ac7e538db689ea5dff24bfee530 2019-02-21 21:12:07
From: Unknown <xyz258@abwesend.de>
Date: 2019-02-21 21:12:07
Subject: [PATCH] p
---

diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh
index 9817d7a..79496f5 100644
--- a/bootstrap.d/12-locale.sh
+++ b/bootstrap.d/12-locale.sh
@@ -7,6 +7,14 @@
 
 # Install and setup timezone
 echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
+if [ -f "${ETC_DIR}/localtime" ]; then
+    # 1. If 11-apt.sh upgrades the package 'tzdata', '/etc/localtime' was created
+    #    because 'dpkg-reconfigure -f noninteractive tzdata' was executed by apt-get.
+    # 2. If '/etc/localtime' exists, our execution of 'dpkg-reconfigure -f noninteractive tzdata' 
+    #    will ignore the our timezone set in '/etc/timezone'.
+    # 3. Removing /etc/localtime will solve this.
+    rm -f "${ETC_DIR}/localtime"
+fi
 chroot_exec dpkg-reconfigure -f noninteractive tzdata
 
 # Install and setup default locale and keyboard configuration
diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index a8c521f..467bf72 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -33,84 +33,81 @@ if [ "$ENABLE_USBBOOT" = true ] ; then
   sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
 
   # Add usb/sda2 disk to crypttab
-  sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
+  if [ "$ENABLE_CRYPTFS" = true ] ; then
+	sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
+  fi
 fi
 
 # Generate initramfs file
 if [ "$ENABLE_INITRAMFS" = true ] ; then
-  if [ "$ENABLE_CRYPTFS" = true ] ; then
-    # 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_CRYPTFS" = true ] ; then
+		# 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)
+		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")
+			# 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 [ "$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
-
- 	    # 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
+			# 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
+		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
+
+				# Save Keys - convert with putty from rsa/openssh to puttkey
+				cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa
+			fi
+		
+			# 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
+		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"
+
+		# Dummy mapping required by mkinitramfs
+		echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
+
+		# Remove dummy mapping
+		chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
 	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"
 
-    # Dummy mapping required by mkinitramfs
-    echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
-
-    # Generate initramfs with encrypted root partition support
-    chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
-
-    # Remove dummy mapping
-    chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
-  else
-    # Generate initramfs without encrypted root partition support
-    chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
-  fi
+	fi
+	# Generate initramfs without encrypted root partition support
+	chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
 fi