From d9028002428b4241ace410a144756badca531310 Mon Sep 17 00:00:00 2001
From: jandob
Date: Sat, 23 Jan 2016 09:05:13 +0100
Subject: automatic xmount building

---
 builder/dnbd3-rootfs/module-setup.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'builder/dnbd3-rootfs/module-setup.sh')

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index fa6c4871..9798172f 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -125,13 +125,15 @@ install() {
 
     # load dnbd3.ko
     inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
+    # get the openslx config from the servers configured in the kernel command
+    # line (${SLX_SERVER}/${SLX_SERVER_BASE}/config)
+    inst_hook pre-mount 00 "$moddir/hooks/fetch-config.sh"
 
+    # make the final blockdevice for the root system (dnbd3 -> xmount ->
+    # device-mapper)
     if dracut_module_included "systemd-initrd"; then
         inst "$moddir/hooks/prepare-root-partition.sh" \
             /usr/bin/dnbd3root
-        inst "$moddir/hooks/fetch-config.sh" \
-            /usr/bin/fetch-config
-
         inst_simple "${moddir}/services/dnbd3root.service" \
             "${systemdsystemunitdir}/dnbd3root.service"
         # don't kill at switch_root
@@ -140,11 +142,6 @@ install() {
             "${systemdsystemunitdir}/initrd-root-fs.target.wants/dnbd3root.service"
         inst_hook pre-pivot 95 "$moddir/hooks/copy-dnbd3-generator-into-newroot.sh"
     else
-        # get the openslx config from the servers configured in the kernel command
-        # line (${SLX_SERVER}/${SLX_SERVER_BASE}/config)
-        inst_hook pre-mount 00 "$moddir/hooks/fetch-config.sh"
-        # make the final blockdevice for the root system (dnbd3 -> qemu-nbd ->
-        # device-mapper)
         inst_hook pre-mount 10 "$moddir/hooks/prepare-root-partition.sh"
     fi
 
-- 
cgit v1.2.3-55-g7522