update production settings

1 files changed, 23 insertions, 21 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 18c82b53..95e2989e 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -101,6 +101,26 @@ installkernel() {
 }
 
 install() {
+
+    # region binaries
+
+    inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/bin/dnbd3-client
+    inst "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" \
+        /usr/bin/systemd-preserve-process-marker
+    # TODO: static linked qemu-nbd still needed?
+    #inst "$moddir/binaries/qemu/qemu-nbd" /usr/bin/qemu-nbd
+
+    # endregion
+
+    # region hooks
+
+    inst_hook cmdline 00 "$moddir/hooks/enable-sysrq.sh"
+    inst_hook cmdline 10 "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
+    inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh"
+
+    # load nbd.ko, dnbd3.ko
+    inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
+
     if dracut_module_included "systemd-initrd"; then
         # TODO analyze qemu-nbd pivot-root bug!
         inst_script "$moddir/services/dnbd3-generator.sh" \
@@ -131,25 +151,6 @@ install() {
         inst_hook pre-mount 10 "$moddir/hooks/prepare-root-partition.sh"
     fi
 
-    # region binaries
-
-    inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/bin/dnbd3-client
-    inst "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" \
-        /usr/bin/systemd-preserve-process-marker
-    # TODO: static linked qemu-nbd still needed?
-    #inst "$moddir/binaries/qemu/qemu-nbd" /usr/bin/qemu-nbd
-
-    # endregion
-
-    # region hooks
-
-    inst_hook cmdline 00 "$moddir/hooks/enable-sysrq.sh"
-    inst_hook cmdline 10 "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
-    inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh"
-
-    # load nbd.ko, dnbd3.ko
-    inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
-
     inst_hook mount 10 "$moddir/hooks/mount-root-device.sh"
 
     inst_hook pre-pivot 00 "$moddir/hooks/copy-openslx-configuration-into-newroot.sh"
@@ -192,8 +193,9 @@ install() {
         blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
         basename dirname sort mktemp diff qemu-img
     # Production:
-    # inst_multiple insmod qemu-nbd blockdev partx dmsetup sed cat cut awk tr \
-    #     losetup dd mkfs.ext4 grep basename dirname mktemp diff
+    # inst_multiple insmod blockdev partx dmsetup sed cat cut awk tr touch \
+    #     losetup grep basename dirname mktemp diff sleep wget mount sort \
+    #     qemu-nbd bash
 }
 
 # region vim modline