bugfixes

1 files changed, 25 insertions, 17 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 8b16e71a..b86273be 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -15,16 +15,11 @@ clean() {
     # NOTE: This method is currently triggered manually and not supported by
     # dracut itself.
 
-    if [[ -f "$moddir/binaries/nbd/nbd.ko" ]]; then
-        build_clean_nbd "$moddir/binaries/nbd/"
-    fi
-    if [[ -f "$moddir/binaries/dnbd3/build/dnbd3.ko" || ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then
-        build_clean_dnbd3 "$moddir/binaries/dnbd3/"
-    fi
-    if [[ -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then
-        build_clean_systemd_preserve_process_marker \
-            "$moddir/binaries/systemd-preserve-process-marker/"
-    fi
+    build_clean_xmount "$moddir/binaries/xmount/"
+    build_clean_qemu_xmount "$moddir/binaries/qemu-xmount/"
+    build_clean_dnbd3 "$moddir/binaries/dnbd3/"
+    build_clean_systemd_preserve_process_marker \
+        "$moddir/binaries/systemd-preserve-process-marker/"
     return 0
 }
 
@@ -32,8 +27,13 @@ check() {
 
     exceptions.activate
 
-    if [[ ! -f "$moddir/binaries/nbd/nbd.ko" ]]; then
-        build_compile_nbd "$moddir/binaries/nbd/"
+    if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] || \
+        [[ ! -f "$moddir/binaries/xmount/trunk/build/libxmount_input/libxmount_input_raw/libxmount_input_raw.so" ]]
+    then
+        build_compile_xmount "$moddir/binaries/xmount/"
+    fi
+    if [[ ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then
+        build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/"
     fi
     if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \
        [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]
@@ -76,8 +76,6 @@ depends() {
 installkernel() {
     inst "$moddir/binaries/dnbd3/build/dnbd3.ko" \
         /usr/lib/modules/current/extra/dnbd3.ko
-    inst "$moddir/binaries/nbd/nbd.ko" \
-        /usr/lib/modules/current/extra/nbd.ko
 
     # Debugging:
     instmods cfg80211 rfkill vboxsf nls_iso8859_1 ppdev nls_cp437 iosf_mbi \
@@ -108,6 +106,19 @@ install() {
         /usr/bin/device-add-write-layer
     inst "$moddir/scripts/container-unpack-xmount.sh" \
         /usr/bin/container-unpack-xmount
+    # xmount
+    inst "$moddir/binaries/xmount/trunk/build/src/xmount" /usr/bin/xmount
+    inst_dir /usr/lib/xmount
+    inst "$moddir/binaries/xmount/trunk/build/libxmount_input/libxmount_input_raw/libxmount_input_raw.so" \
+        /usr/local/lib/xmount/libxmount_input_raw.so
+    inst "$moddir/binaries/xmount/trunk/build/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.so" \
+        /usr/local/lib/xmount/libxmount_morphing_combine.so
+    inst "$moddir/binaries/xmount/trunk/build/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.so" \
+        /usr/local/lib/xmount/libxmount_morphing_raid.so
+    inst "$moddir/binaries/xmount/trunk/build/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.so" \
+        /usr/local/lib/xmount/libxmount_morphing_unallocated.so
+    inst "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \
+        /usr/local/lib/xmount/libxmount_input_qemu.so
 
     # endregion
 
@@ -183,9 +194,6 @@ install() {
         insmod blockdev partx dmsetup sed cut awk tr insmod \
         blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
         basename dirname sort mktemp diff qemu-img genfstab mountpoint xmount
-    for file in "/usr/local/lib/xmount/*"; do
-        inst_simple $file
-    done
     # Production:
     # inst_multiple insmod blockdev partx dmsetup sed cat cut awk tr touch \
     #     losetup grep basename dirname mktemp diff sleep wget mount sort \