Fixed mounting for OS X 10.15 Catalina

config.sample

@@ -8,6 +8,9 @@ IPSW_STORE="$STORE"/ipsw
 # Where to store extracted and processed files.
 OUT_STORE="$STORE"/out
 
+# Where to mount root filesystem.
+MOUNT_DIR="$STORE"/mnt
+
 # Make scripts print out general information.
 INFO=1
 

scripts/common

@@ -126,6 +126,10 @@ if [[ "$OUT_STORE" != /* ]]; then
     OUT_STORE=../"$OUT_STORE"
 fi
 
+if [[ "$MOUNT_DIR" != /* ]]; then
+    MOUNT_DIR=../"$MOUNT_DIR"
+fi
+
 out_dir="$OUT_STORE"/"$base"
 ipsw="$IPSW_STORE"/"$base"_Restore.ipsw
 

scripts/copy_sandboxd

@@ -2,7 +2,7 @@
 
 source common
 
-mount_point=/mnt/ios/"$base"
+mount_point=$(realpath "$MOUNT_DIR"/ios/"$base")
 if ! mount | grep -qs "$mount_point"; then
     error "No volume is mounted in $mount_point"
     exit 1

scripts/extract_dyld_shared_cache

@@ -7,7 +7,7 @@ if [[ $OSTYPE != darwin* ]]; then
     exit 1
 fi
 
-mount_point=/mnt/ios/"$base"
+mount_point=$(realpath "$MOUNT_DIR"/ios/"$base")
 if ! mount | grep -qs "$mount_point"; then
     error "No volume is mounted in $mount_point"
     exit 1

scripts/mount_fs

@@ -23,8 +23,11 @@ else
     fi
 fi
 
-mount_point=/mnt/ios/"$base"
+mount_point="$MOUNT_DIR"/ios/"$base"
+
 mkdir -p "$mount_point"
+
+mount_point=$(realpath "$mount_point")
 if mount | grep -qs "$mount_point"; then
     error "A volume is already mounted in $mount_point"
     error "Unmount it first from $mount_point"

scripts/pack_filesystem

@@ -7,7 +7,7 @@ if test $UID -ne 0; then
     exit 1
 fi
 
-mount_point=/mnt/ios/"$base"
+mount_point=$(realpath "$MOUNT_DIR"/ios/"$base")
 if ! mount | grep -qs "$mount_point"; then
     error "No volume is mounted in $mount_point"
     exit 1

scripts/unmount_fs

@@ -7,7 +7,7 @@ if test $UID -ne 0; then
     exit 1
 fi
 
-mount_point=/mnt/ios/"$base"
+mount_point=$(realpath "$MOUNT_DIR"/ios/"$base")
 if ! mount | grep -qs "$mount_point"; then
     error "No volume is mounted in $mount_point"
     exit 1