From 20dc2337a3f642fc6eaf66f45b63d8ad815234b7 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 6 Sep 2019 15:32:30 +0200
Subject: [dnbd3-rootfs] more fixes for kqcow

---
 builder/build-initramfs.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'builder/build-initramfs.sh')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 8e5df3fd..51ae5ddf 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -547,6 +547,7 @@ main() {
     fi
     logging.info " * kernel headers: $kernel_headers"
     [ -n "$qcow_handler" ] && logging.info " * qcow2 handler: $qcow_handler"
+    export _QCOW_HANDLER="$qcow_handler"
     # endregion
     # region dependency checks and command line parsing
     result=0
@@ -693,12 +694,10 @@ main() {
     elif [[ "$cleanup" == 'yes' ]]; then
         logging.info 'Removing distribution specific files.'
         cleanup
-    else
+    elif [[ "$initialize" == 'yes' ]]; then
         . "${_root_dir}/modules.d/dnbd3-rootfs/helper/build.inc"
-        initialize_components "$qcow_handler"
-        if [[ "$initialize" == 'yes' ]]; then
-            exit 0
-        fi
+        build_initialize_components
+    else
         logging.info 'Build initramfs.'
         # NOTE: We deactivate our exception handle since dracut returns "1" if
         # it is launched with help parameter ("-h" or "--help").
-- 
cgit v1.2.3-55-g7522