From 6624821f55baedd2fc40b5d21a736f32891d39ff Mon Sep 17 00:00:00 2001 From: Sinipelto Date: Mon, 20 Nov 2023 14:12:35 +0200 Subject: [PATCH] BuildSystem: image sh mount in build dir Signed-off-by: Sinipelto --- script/image.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/script/image.sh b/script/image.sh index c055a26f..8a4c8789 100755 --- a/script/image.sh +++ b/script/image.sh @@ -10,15 +10,20 @@ if [[ -z $BANAN_SYSROOT_TAR ]]; then exit 1 fi +if [[ -z $BANAN_BUILD_DIR ]]; then + echo "You must set the BANAN_BUILD_DIR environment variable" >&2 + exit 1 +fi + if [[ "$1" == "full" ]] || [[ ! -f $BANAN_DISK_IMAGE_PATH ]]; then $BANAN_SCRIPT_DIR/image-create.sh fi -LOOP_DEV=$(sudo losetup --show -f "$BANAN_DISK_IMAGE_PATH") +LOOP_DEV="$(sudo losetup --show -f $BANAN_DISK_IMAGE_PATH)" sudo partprobe $LOOP_DEV -ROOT_PARTITION=${LOOP_DEV}p2 -MOUNT_DIR="${MOUNT_DIR:-/bananmnt}" +ROOT_PARTITION="${LOOP_DEV}p2" +MOUNT_DIR="${MOUNT_DIR:-$BANAN_BUILD_DIR/bananmnt}" sudo mkdir -p $MOUNT_DIR || { echo "Failed to create mount point dir."; exit 1; } @@ -32,4 +37,4 @@ sudo umount $MOUNT_DIR || { echo "Failed to unmount banan mount."; exit 1; } sudo losetup -d $LOOP_DEV || { echo "Failed to remove loop device for banan mount."; exit 1; } -sudo rm -rf $MOUNT_DIR +sudo rm -rf "$MOUNT_DIR"