summaryrefslogtreecommitdiffstats
path: root/config.d
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-11-25 13:57:02 +1100
committerMartin Schwenke <martin@meltin.net>2013-11-25 13:57:02 +1100
commit628ec5a775f335d8c867dfd1daaedde876354b75 (patch)
tree76032b075bd367c65ba16ca170a7317fa81848a6 /config.d
parent383f04623beb38a2f23d492232643ddb51cf7d09 (diff)
downloadautocluster-628ec5a775f335d8c867dfd1daaedde876354b75.tar.gz
autocluster-628ec5a775f335d8c867dfd1daaedde876354b75.tar.xz
autocluster-628ec5a775f335d8c867dfd1daaedde876354b75.zip
guestfish/guestmount: If no SYSTEM_DISK_MOUNTS specified then pass -i
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'config.d')
-rw-r--r--config.d/05diskimage_guestfish.defconf1
-rw-r--r--config.d/05diskimage_guestmount.defconf1
2 files changed, 2 insertions, 0 deletions
diff --git a/config.d/05diskimage_guestfish.defconf b/config.d/05diskimage_guestfish.defconf
index 2f6b214..cd40b03 100644
--- a/config.d/05diskimage_guestfish.defconf
+++ b/config.d/05diskimage_guestfish.defconf
@@ -17,6 +17,7 @@ diskimage_mount_guestfish ()
mount_args="${mount_args}${mount_args:+ } --mount ${d}:${m}"
echo " mount ${m} from device ${d} configured"
done
+ [ -n "$mount_args" ] || mount_args="-i"
eval $(guestfish --listen -a "$1" $mount_args)
diff --git a/config.d/05diskimage_guestmount.defconf b/config.d/05diskimage_guestmount.defconf
index da4369c..3074caf 100644
--- a/config.d/05diskimage_guestmount.defconf
+++ b/config.d/05diskimage_guestmount.defconf
@@ -19,6 +19,7 @@ diskimage_mount_guestmount ()
mount_args="${mount_args}${mount_args:+ } --mount ${d}:${m}"
echo " mount ${m} from device ${d} configured"
done
+ [ -n "$mount_args" ] || mount_args="-i"
mkdir -p mnt
guestmount -a "$disk" $mount_args mnt || \