From 491c15ec63e891a4fb9f24da373e8e8c2b569c25 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 27 Dec 2024 23:24:44 +0100 Subject: [PATCH] tree: rework more Signed-off-by: AuxXxilium --- img-gen-n.sh | 4 ++-- img-gen-s.sh | 4 ++-- scripts/func.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/img-gen-n.sh b/img-gen-n.sh index 65fdf6d0..e3e8e64d 100755 --- a/img-gen-n.sh +++ b/img-gen-n.sh @@ -29,6 +29,8 @@ LOOPX=$(sudo losetup -f) sudo losetup -P "${LOOPX}" "${IMAGE_FILE}" echo "Mounting Image File" +sudo umount "/tmp/p1" +sudo umount "/tmp/p3" sudo rm -rf "/tmp/p1" sudo rm -rf "/tmp/p3" mkdir -p "/tmp/p1" @@ -49,8 +51,6 @@ if [ -f "brx/bzImage-arc" ] && [ -f "brx/initrd-arc" ]; then createArc repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc" else - sudo umount "/tmp/p1" - sudo umount "/tmp/p3" exit 1 fi diff --git a/img-gen-s.sh b/img-gen-s.sh index ff140a8c..31632a74 100755 --- a/img-gen-s.sh +++ b/img-gen-s.sh @@ -28,6 +28,8 @@ LOOPX=$(sudo losetup -f) sudo losetup -P "${LOOPX}" "${IMAGE_FILE}" echo "Mounting Image File" +sudo umount "/tmp/p1" +sudo umount "/tmp/p3" sudo rm -rf "/tmp/p1" sudo rm -rf "/tmp/p3" mkdir -p "/tmp/p1" @@ -48,8 +50,6 @@ if [ -f "brs/bzImage-arc" ] && [ -f "brs/initrd-arc" ]; then createArc repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc" else - sudo umount "/tmp/p1" - sudo umount "/tmp/p3" exit 1 fi diff --git a/scripts/func.sh b/scripts/func.sh index 78a7d018..eb341e9a 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -503,7 +503,7 @@ function copyBuildroot() { # create arc executable function createArc() { - ./scripts/make/makeself.sh --current --zstd --chown --threads=0 --quiet "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" + ./scripts/make/makeself.sh --current --zstd --quiet "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" rm -rf "../arc/files/initrd/opt/arc" mkdir -p "../arc/files/initrd/opt/arc" mv -f "arc" "../arc/files/initrd/opt/arc/"