From 1ebd4e120c7a2fe52ed2dd96167b68cd72ec832e Mon Sep 17 00:00:00 2001
From: torben
Date: Fri, 6 Nov 2015 13:03:10 +0100
Subject: Fix btrfs dependency. Fix rebuilding of dracut binaries if not
 needed.

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

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 4f761f23..74b2e825 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -233,10 +233,20 @@ EOF
             build_initramfs_initialize_dracut
         fi
         utils_log 'Build initramfs.' && \
-        utils_log 'Copy dnbd3 plugin into dracut modules folder.' && \
-        cp --recursive --force --no-target-directory \
-            dnbd3-rootfs/ dracut/modules.d/90dnbd3-rootfs \
-            1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+        utils_log 'Link dnbd3 plugin into dracut modules folder.' && \
+        local dracut_modules_source='../../dnbd3-rootfs' && \
+        local dracut_modules_target='dracut/modules.d/90dnbd3-rootfs' && \
+        if [[ ! -L "$dracut_modules_target" || "$(readlink \
+            "$dracut_modules_target")" != "$dracut_modules_source" ]]
+        then
+            ln --symbolic "$dracut_modules_source" "$dracut_modules_target" \
+                1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
+            # NOTE: If you copy we would have to recompile each binaries every
+            # time.
+            #cp --recursive --force --no-target-directory \
+            #    dnbd3-rootfs/ dracut/modules.d/90dnbd3-rootfs \
+            #    1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
+        fi
         local loglevel=''
         if [ "$UTILS_VERBOSE" == 'yes' ]; then
             loglevel='--verbose'
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 14d49686..b1811672 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -13,7 +13,7 @@ check() {
 }
 
 depends() {
-    echo base network bash kernel-modules
+    echo base network bash kernel-modules btrfs
 }
 
 installkernel() {
@@ -22,7 +22,7 @@ installkernel() {
     inst "$moddir/binaries/nbd/nbd.ko" \
         /usr/lib/modules/current/extra/nbd.ko
 
-    instmods ext4 btrfs
+    instmods ext4
 }
 
 install() {
-- 
cgit v1.2.3-55-g7522