From fdaadfef8be601a190c52424d1f396d50f93c90f 2018-11-17 02:14:12 From: burnbabyburn Date: 2018-11-17 02:14:12 Subject: [PATCH] bugfix --- diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh index 28ab98c..066c284 100644 --- a/bootstrap.d/15-rpi-config.sh +++ b/bootstrap.d/15-rpi-config.sh @@ -62,6 +62,7 @@ if [ "$ENABLE_CRYPTFS" = true ] ; then CMDLINE=$(echo "${CMDLINE}" | sed "s/sda2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda2:${CRYPTFS_MAPPING}/") else CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/") + fi fi fi diff --git a/bootstrap.d/41-uboot.sh b/bootstrap.d/41-uboot.sh index a6f46b5..80c8bb3 100644 --- a/bootstrap.d/41-uboot.sh +++ b/bootstrap.d/41-uboot.sh @@ -52,8 +52,6 @@ if [ "$ENABLE_UBOOT" = true ] ; then # Configure U-Boot to load generated initramfs printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage" - - fi else # ENABLE_INITRAMFS=false # Remove initramfs from U-Boot mkfile sed -i '/.*initramfs.*/d' "${BOOT_DIR}/uboot.mkimage" @@ -101,4 +99,3 @@ if [ "$ENABLE_UBOOT" = true ] ; then # Remove U-Boot sources rm -fr "${R}/tmp/u-boot" fi -