Move sanity check for qcow2 images requiring NBD out of main script.

This is now a condition that only applies for if
$SYSTEM_DISK_ACCESS_METHOD is "loopback", so move the check to
05diskimage_guestfish.defconf, check the loopback condition and use
post_config_hooks to invoke the check.

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

diff --git a/autocluster b/autocluster
index dd70f88b95bd7523d179e5b2d193c996860ecf7d..de7c8400bb2e9d006c8745f79ddb676a9b8cd8df 100755 (executable)
--- a/autocluster
+++ b/autocluster
@@ -1181,10 +1181,6 @@ trap 'es=$?;
 
 # check for needed programs 
 check_command expect
-if [ "$SYSTEM_DISK_FORMAT" = "qcow2" ] ; then
-    check_command $QEMU_NBD
-    check_command nbd-client
-fi
 
 [ $# -lt 1 ] && usage
 

diff --git a/config.d/05diskimage_loopback.defconf b/config.d/05diskimage_loopback.defconf
index be49e886af05b599937f74d9780337aa7c3f57d7..6958092c22a4f7839b49d1064929cf227661556b 100644 (file)
--- a/config.d/05diskimage_loopback.defconf
+++ b/config.d/05diskimage_loopback.defconf
@@ -145,6 +145,19 @@ diskimage_mv_loopback ()
 
 ######################################################################
 
+diskimage_loopback_sanity_check ()
+{
+    if [ "$SYSTEM_DISK_FORMAT" = "qcow2" -a \
+       "$SYSTEM_DISK_ACCESS_METHOD" = "loopback" ] ; then
+       check_command $QEMU_NBD
+       check_command nbd-client
+    fi
+}
+
+register_hook post_config_hooks diskimage_loopback_sanity_check
+
+######################################################################
+
 # Private functions
 
 # mount a qemu image via nbd