From 1162888659164f12c5bf3469f18807b34f36a5d6 Mon Sep 17 00:00:00 2001
From: torben
Date: Thu, 28 Jan 2016 14:29:30 +0100
Subject: Add more centos support.

---
 builder/build-initramfs.sh           |  2 +-
 builder/dnbd3-rootfs/module-setup.sh | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index c2af04a7..1443396d 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -99,7 +99,7 @@ build_initramfs_create_system_image=''
 build_initramfs_cleanup='no'
 build_initramfs_use_systemd_in_initramfs='no'
 build_initramfs_dependencies=(cpio git test shift mktemp cat rm sed gzip curl \
-    tar grep make gcc cmake readlink dirname dmsetup chroot qemu-nbd)
+    tar grep make gcc cmake readlink dirname dmsetup chroot)
 
 # endregion
 
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 9798172f..dcc96766 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -28,12 +28,21 @@ check() {
     exceptions.activate
 
     # NOTE: xmount must be compiled before qemu_xmount
-    if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]]
-    then
-        build_compile_xmount "$moddir/binaries/xmount/"
+    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)."
+        fi
     fi
-    if [[ ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then
-        build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/"
+    if $xmount_was_successfull && [[ \
+        ! -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)."
     fi
     if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \
        [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]
-- 
cgit v1.2.3-55-g7522