summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2011-02-10 12:09:20 +1100
committerMartin Schwenke <martin@meltin.net>2011-02-10 16:11:17 +1100
commitb4dd496cfc7a79801fdafacc263ba2405113f6b0 (patch)
tree83566d784f5e27931db9a24e748e6c73d2ed78e0
parentf15b7869b0e5d0156b8728682e67f24eba0017ea (diff)
Work around guestfish mkdir-p working badly with pre-existing symlinks.
Signed-off-by: Martin Schwenke <martin@meltin.net>
-rw-r--r--config.d/05_diskimage_guestfish.defconf5
1 files changed, 4 insertions, 1 deletions
diff --git a/config.d/05_diskimage_guestfish.defconf b/config.d/05_diskimage_guestfish.defconf
index e8e3e03..fc20556 100644
--- a/config.d/05_diskimage_guestfish.defconf
+++ b/config.d/05_diskimage_guestfish.defconf
@@ -40,7 +40,10 @@ diskimage_unmount_guestfish ()
diskimage_mkdir_p_guestfish ()
{
- guestfish --remote mkdir-p "$1"
+ local t=$(guestfish --remote is-dir "$1/.")
+ if [ "$t" = "false" ] ; then
+ guestfish --remote mkdir-p "$1"
+ fi
}
diskimage_substitute_vars_guestfish ()