From b039913c80173bd9a7ec0d2bc50c9403548d9ca9 2020-11-16 14:50:08 From: g-vidal Date: 2020-11-16 14:50:08 Subject: [PATCH] error on indentation o --- diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 0c6defc..8ec0198 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -703,13 +703,13 @@ fi # Execute custom scripts inside the chroot if [ -n "$CHROOT_SCRIPTS" ] && [ -d "$CHROOT_SCRIPTS" ] ; then cp -r "${CHROOT_SCRIPTS}" "${R}/chroot_scripts" - chroot_exec /bin/bash -x <<'EOF' - for SCRIPT in /chroot_scripts/* ; do - if [ -f $SCRIPT -a -x $SCRIPT ] ; then - $SCRIPT - fi - done - EOF + chroot_exec /bin/bash -x << EOF +for SCRIPT in /chroot_scripts/* ; do + if [ -f $SCRIPT -a -x $SCRIPT ] ; then + $SCRIPT + fi +done +EOF rm -rf "${R}/chroot_scripts" fi @@ -824,14 +824,14 @@ if [ "$ENABLE_SPLITFS" = true ] ; then dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek="${ROOT_SECTORS}" # Write firmware/boot partition tables - sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null < /dev/null << EOM +${TABLE_SECTORS},${FRMW_SECTORS},c,* +EOM # Write root partition table - sfdisk -q -L -uS -f "$IMAGE_NAME-root.img" 2> /dev/null < /dev/null << EOM +${TABLE_SECTORS},${ROOT_SECTORS},83 +EOM # Setup temporary loop devices FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME"-frmw.img)" @@ -841,10 +841,10 @@ else # ENABLE_SPLITFS=false dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek="${IMAGE_SECTORS}" # Write partition table - sfdisk -q -L -uS -f "$IMAGE_NAME.img" 2> /dev/null < /dev/null << EOM +${TABLE_SECTORS},${FRMW_SECTORS},c,* +${ROOT_OFFSET},${ROOT_SECTORS},83 +EOM # Setup temporary loop devices FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME".img)"