From 6c09d58da44afe9726d4441488cf9e154ab8450b Mon Sep 17 00:00:00 2001
From: jandob
Date: Fri, 12 Feb 2016 10:11:07 +0100
Subject: fix build exception handling

---
 builder/dnbd3-rootfs/module-setup.sh | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index bd6b8df3..7c516f6a 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -34,30 +34,32 @@ check() {
     exceptions.activate
 
     # NOTE: xmount must be compiled before qemu_xmount
+    local xmount_is_built=true
     if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]]; then
-        if build_compile_xmount "$moddir/binaries/xmount/"; then
-            local xmount_was_successfull=true
-        else
-            local xmount_was_successfull=false
-            logging.warn \
-                "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)."
+        if ! build_compile_xmount "$moddir/binaries/xmount/"; then
+            xmount_is_built=false
         fi
     fi
-    if $xmount_was_successfull && [[ \
+    if $xmount_is_built && [[ \
         ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \
     ]]; then
         build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" || \
-        logging.warn \
-            "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)."
+        xmount_is_built=false
     fi
+    $xmount_is_built || logging.warn \
+        "Compiling \"xmount\" failed -> No support for container files (only raw images)."
+
     if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \
        [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]
     then
-        build_compile_dnbd3 "$moddir/binaries/dnbd3/" || return 1
+        build_compile_dnbd3 "$moddir/binaries/dnbd3/"
+        [[ $? != 0 ]] && return 1
     fi
+
     if [[ ! -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then
         build_compile_systemd_preserve_process_marker \
-            "$moddir/binaries/systemd-preserve-process-marker/" || return 1
+            "$moddir/binaries/systemd-preserve-process-marker/"
+            [[ $? != 0 ]] && return 1
     fi
 
     # NOTE: This are workarounds for:
@@ -79,7 +81,8 @@ check() {
 
     exceptions.deactivate
 
-    # This modules is only needed if specified explicitly.
+    # Tell dracut that this module should only be included if is required
+    # explicitly.
     return 255
 }
 
-- 
cgit v1.2.3-55-g7522