From a7b1810aa26442e4f60d6dfd3ab879fb1ddaf928 Mon Sep 17 00:00:00 2001 From: Sinipelto Date: Mon, 20 Nov 2023 13:24:15 +0200 Subject: [PATCH 1/5] Update script/image.sh handle custom mount dir Signed-off-by: Sinipelto --- script/image.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/script/image.sh b/script/image.sh index 9b7760ee..404a0a0f 100755 --- a/script/image.sh +++ b/script/image.sh @@ -18,7 +18,9 @@ LOOP_DEV=$(sudo losetup --show -f "$BANAN_DISK_IMAGE_PATH") sudo partprobe $LOOP_DEV ROOT_PARTITION=${LOOP_DEV}p2 -MOUNT_DIR=/mnt +MOUNT_DIR=/bananmnt + +sudo mkdir -p $MOUNT_DIR || { echo "Failed to create mount point dir."; exit 1; } sudo mount $ROOT_PARTITION $MOUNT_DIR @@ -26,6 +28,8 @@ cd $MOUNT_DIR sudo tar xf $BANAN_SYSROOT_TAR cd -sudo umount $MOUNT_DIR +sudo umount $MOUNT_DIR || { echo "Failed to unmount banan mount."; exit 1; } -sudo losetup -d $LOOP_DEV +sudo losetup -d $LOOP_DEV || { echo "Failed to remove loop device for banan mount."; exit 1; } + +sudo rm -rf $MOUNT_DIR -- 2.40.1 From 566724d986856b83a5b8e3a9b26dfeb7459f5509 Mon Sep 17 00:00:00 2001 From: Sinipelto Date: Mon, 20 Nov 2023 13:28:10 +0200 Subject: [PATCH 2/5] Update script/image-create.sh custom mount dir Signed-off-by: Sinipelto --- script/image-create.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/script/image-create.sh b/script/image-create.sh index 246df4ca..e617d904 100755 --- a/script/image-create.sh +++ b/script/image-create.sh @@ -26,7 +26,7 @@ if [[ -z $BANAN_ARCH ]]; then fi DISK_SIZE=$[50 * 1024 * 1024] -MOUNT_DIR=/mnt +MOUNT_DIR="${MOUNT_DIR:-/bananmnt}" truncate -s 0 "$BANAN_DISK_IMAGE_PATH" truncate -s $DISK_SIZE "$BANAN_DISK_IMAGE_PATH" @@ -79,6 +79,8 @@ PARTITION2=${LOOP_DEV}p2 sudo mkfs.ext2 -b 1024 -q $PARTITION2 +sudo mkdir -p $MOUNT_DIR || { echo "Failed to create banan mount dir."; exit 1; } + if [[ "$BANAN_BOOTLOADER" == "GRUB" ]]; then if [[ "$BANAN_UEFI_BOOT" == "1" ]]; then sudo mkfs.fat $PARTITION1 > /dev/null @@ -100,7 +102,9 @@ if [[ "$BANAN_BOOTLOADER" == "GRUB" ]]; then fi fi -sudo losetup -d $LOOP_DEV +sudo losetup -d $LOOP_DEV || { echo "Failed to remove loop device for banan mount."; exit 1; } + +sudo rm -rf $MOUNT_DIR || { echo "Failed to remove banan mount dir."; exit 1; } if [[ "$BANAN_BOOTLOADER" == "GRUB" ]]; then echo > /dev/null -- 2.40.1 From f97922a2b5a47d26c4c8e4185ba0750b3391e894 Mon Sep 17 00:00:00 2001 From: Sinipelto Date: Mon, 20 Nov 2023 13:28:53 +0200 Subject: [PATCH 3/5] Update script/image.sh mount dir default value Signed-off-by: Sinipelto --- script/image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/image.sh b/script/image.sh index 404a0a0f..c055a26f 100755 --- a/script/image.sh +++ b/script/image.sh @@ -18,7 +18,7 @@ LOOP_DEV=$(sudo losetup --show -f "$BANAN_DISK_IMAGE_PATH") sudo partprobe $LOOP_DEV ROOT_PARTITION=${LOOP_DEV}p2 -MOUNT_DIR=/bananmnt +MOUNT_DIR="${MOUNT_DIR:-/bananmnt}" sudo mkdir -p $MOUNT_DIR || { echo "Failed to create mount point dir."; exit 1; } -- 2.40.1 From 6cfa56dcecbf97b06505e87373ab74bf02fcd24a Mon Sep 17 00:00:00 2001 From: Sinipelto Date: Mon, 20 Nov 2023 14:11:29 +0200 Subject: [PATCH 4/5] BuildSystem: image create sh use banan build dir Signed-off-by: Sinipelto --- script/image-create.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/script/image-create.sh b/script/image-create.sh index e617d904..e3b002ea 100755 --- a/script/image-create.sh +++ b/script/image-create.sh @@ -25,8 +25,18 @@ if [[ -z $BANAN_ARCH ]]; then exit 1 fi +if [[ -z $BANAN_UEFI_BOOT ]]; then + echo "You must set the BANAN_UEFI_BOOT environment variable" >&2 + exit 1 +fi + +if [[ -z $BANAN_BUILD_DIR ]]; then + echo "You must set the BANAN_BUILD_DIR environment variable" >&2 + exit 1 +fi + DISK_SIZE=$[50 * 1024 * 1024] -MOUNT_DIR="${MOUNT_DIR:-/bananmnt}" +MOUNT_DIR="${MOUNT_DIR:-$BANAN_BUILD_DIR/bananmnt}" truncate -s 0 "$BANAN_DISK_IMAGE_PATH" truncate -s $DISK_SIZE "$BANAN_DISK_IMAGE_PATH" -- 2.40.1 From d72db1f81ca901fc14261894b20b5be29c118b5b Mon Sep 17 00:00:00 2001 From: Sinipelto Date: Mon, 20 Nov 2023 14:12:35 +0200 Subject: [PATCH 5/5] 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" -- 2.40.1