Fix btrfs dependency. Fix rebuilding of dracut binaries if not needed.

3 files changed, 18 insertions, 7 deletions

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() {
diff --git a/dev-tools/startup.nsh b/dev-tools/startup.nsh
index 6c281a0b..f1366987 100755
--- a/dev-tools/startup.nsh
+++ b/dev-tools/startup.nsh
@@ -1,5 +1,6 @@
 if exist fs0:\debug then
     rm fs0:\debug
-    \vmlinuz-linux initrd=\initramfs-4.2.5-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off rd.vconsole.font=latarcyrheb-sun16 rd.vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8
+    \vmlinuz-linux initrd=\initramfs-4.2.5-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off vconsole.font=latarcyrheb-sun16 vconsole.keymap=de
+    #\vmlinuz-linux initrd=\initramfs-4.2.5-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off vconsole.font=latarcyrheb-sun16 vconsole.keymap=de rd.locale.LANG=de_DE.UTF-8
 endif
 \vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012"