Implement diskimage_is-file() for loopback and guestfish.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/autocluster b/autocluster
index ba64862429957788e7cd87b67d07c4127901ec75..0283edf92b1bcf2909f094c6f7b514e029e8548f 100755 (executable)
--- a/autocluster
+++ b/autocluster
@@ -622,7 +622,7 @@ make_system_disk_access_function ()
 for i in \
     mount unmount \
     mkdir_p substitute_vars chmod chmod_reference \
-    is_directory append_text_file append_text sed put ln_s grep \
+    is_directory is_file append_text_file append_text sed put ln_s grep \
     command \
     ; do
     make_system_disk_access_function "diskimage_$i"

diff --git a/config.d/05_diskimage_guestfish.defconf b/config.d/05_diskimage_guestfish.defconf
index 5e82433be9c693a36823d7574af8cd4d7ef0408d..3d506b6aa9e670463b3dcc1b8499dfe6b4057849 100644 (file)
--- a/config.d/05_diskimage_guestfish.defconf
+++ b/config.d/05_diskimage_guestfish.defconf
@@ -82,6 +82,11 @@ diskimage_chmod_reference_guestfish ()
     done
 }
 
+diskimage_is_file_guestfish ()
+{
+    guestfish --remote is-file "$1"
+}
+
 diskimage_is_directory_guestfish ()
 {
     guestfish --remote is-dir "$1"

diff --git a/config.d/05_diskimage_loopback.defconf b/config.d/05_diskimage_loopback.defconf
index e6b4ab5a80871460eafc8ce42a65f6256e52702f..7dadc3fc946028c8b739fbd818f5e92abde36513 100644 (file)
--- a/config.d/05_diskimage_loopback.defconf
+++ b/config.d/05_diskimage_loopback.defconf
@@ -91,6 +91,11 @@ diskimage_chmod_reference_loopback ()
     done
 }
 
+diskimage_is_file_loopback ()
+{
+    [ -f "mnt$1" ]
+}
+
 diskimage_is_directory_loopback ()
 {
     [ -d "mnt$1" ]