OSDN Git Service

fixed tar
authorkokkiemouse <kokkiemouse@fascode.net>
Sun, 15 Nov 2020 04:21:37 +0000 (13:21 +0900)
committerkokkiemouse <kokkiemouse@fascode.net>
Sun, 15 Nov 2020 04:21:37 +0000 (13:21 +0900)
Signed-off-by: kokkiemouse <kokkiemouse@fascode.net>
build.sh
system/cpp-src/mkalteriso/command_collection.cpp

index c7bac34..acbbf3c 100755 (executable)
--- 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"
index 90d740f..db52c57 100644 (file)
@@ -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;
 }