From 3cf60ec7aa7cd697149a6db6931b767b9169724c 2018-12-10 01:46:49
From: Unknown <xyz258@abwesend.de>
Date: 2018-12-10 01:46:49
Subject: [PATCH] a


---

diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index e56c72e..5392fef 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -26,9 +26,14 @@ if [ "$ENABLE_CRYPTFS" = true ] ; then
   # Add encrypted partition to crypttab and fstab
   install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
   echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks" >> "${ETC_DIR}/crypttab"
+  
+  if [ "$ENABLE_USBBOOT" = true ] ; then
+    # Add usb/sda2 disk to crypttab
+    sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
+  fi
 
   if [ "$ENABLE_SPLITFS" = true ] ; then
-    # Add usb/sda disk to crypttab
+    # Add usb/sda1 disk to crypttab
     sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab"
   fi
 fi
diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index 9a6e718..a4b221e 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -55,12 +55,12 @@ fi
 
 # Setup firmware boot cmdline
 if [ "$ENABLE_USBBOOT" = true ] ; then
-  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd"
+  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline console=tty1 rootwait init=/bin/systemd"
 else
   if [ "$ENABLE_SPLITFS" = true ] ; then
-    CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd"
+    CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline console=tty1 rootwait init=/bin/systemd"
   else
-    CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait init=/bin/systemd"
+    CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline console=tty1 rootwait init=/bin/systemd"
   fi
 fi