@@ -141,6 +141,17 @@ setPropDefaults()
141
141
prop_timeout=
142
142
}
143
143
144
+ # @info: Resolve APFS firmlinks to their actual location
145
+ resolveHostPath ()
146
+ {
147
+ firmlinked_dir=" /System/Volumes/Data$1 "
148
+ if [ -d " $firmlinked_dir " ] ; then
149
+ echo $firmlinked_dir
150
+ else
151
+ echo $1
152
+ fi
153
+ }
154
+
144
155
# @info: Parses and validates the CLI arguments
145
156
parseCli ()
146
157
{
@@ -370,7 +381,7 @@ configureNFS()
370
381
for shared_folder in " ${prop_shared_folders[@]} "
371
382
do
372
383
# Add new exports
373
- exports=" ${exports} \" $shared_folder \" $machine_ip $prop_nfs_config \n"
384
+ exports=" ${exports} \" $( resolveHostPath " $ shared_folder" ) \" $machine_ip $prop_nfs_config \n"
374
385
done
375
386
376
387
# Write new exports block ending
@@ -413,7 +424,7 @@ configureBoot2Docker()
413
424
for shared_folder in " ${prop_shared_folders[@]} "
414
425
do
415
426
bootlocalsh=" ${bootlocalsh}
416
- sudo mount -t nfs -o " $prop_mount_options " " $prop_nfshost_ip " :\" " $shared_folder " \" \" " $shared_folder " \" "
427
+ sudo mount -t nfs -o " $prop_mount_options " " $prop_nfshost_ip " :\" " $( resolveHostPath " $ shared_folder" ) " \" \" " $shared_folder " \" "
417
428
done
418
429
419
430
local file=" /var/lib/boot2docker/bootlocal.sh"
@@ -446,7 +457,7 @@ isNFSMounted()
446
457
for shared_folder in " ${prop_shared_folders[@]} "
447
458
do
448
459
local nfs_mount=$( docker-machine ssh $prop_machine_name " sudo mount" |
449
- grep " $prop_nfshost_ip :$prop_shared_folders on" )
460
+ grep " $prop_nfshost_ip :$( resolveHostPath " $shared_folder " ) on" )
450
461
if [ " " = " $nfs_mount " ]; then
451
462
echo " false" ;
452
463
return ;
0 commit comments