From e3c334af719ee0254e52b13f74a757bdca175de4 Mon Sep 17 00:00:00 2001 From: kokkiemouse Date: Sun, 15 Nov 2020 13:21:37 +0900 Subject: [PATCH] fixed tar Signed-off-by: kokkiemouse --- build.sh | 9 ++++++++- system/cpp-src/mkalteriso/command_collection.cpp | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c7bac340..acbbf3c3 100755 --- a/build.sh +++ b/build.sh @@ -952,7 +952,14 @@ make_efiboot() { # Compress tarball make_tarball() { - cp -a -l -f "${airootfs_dir}" "${work_dir}" + + if [[ "${noaur}" == true ]]; then + cp -a -l -f "${airootfs_dir}" "${work_dir}" + else + umount -fl "${airootfs_dir}" + mkdir -p "${work_dir}/airootfs" + mount "${work_dir}/${arch}/airootfs.img" "${work_dir}/airootfs" + fi if [[ -f "${airootfs_dir}/root/optimize_for_tarball.sh" ]]; then chmod 755 "${airootfs_dir}/root/optimize_for_tarball.sh" diff --git a/system/cpp-src/mkalteriso/command_collection.cpp b/system/cpp-src/mkalteriso/command_collection.cpp index 90d740fc..db52c579 100644 --- a/system/cpp-src/mkalteriso/command_collection.cpp +++ b/system/cpp-src/mkalteriso/command_collection.cpp @@ -117,6 +117,7 @@ int command_collection::command_tarball(QString tarfile_name){ return -810; } _checksum_common(tar_filepath); + _umount_airootfs(); _msg_success("Done! " + tar_filepath); return 0; } -- 2.11.0