1 files changed, 50 insertions, 13 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index b4440ddd..3b60417d 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -68,6 +68,7 @@ check() {
 }
 
 depends() {
+    # DEBUG: echo base network bash kernel-modules systemd-initrd dracut-systemd fs-lib rootfs-block
     echo base network bash kernel-modules
     # NOTE: btrfs module should be used if it would work.
 }
@@ -97,12 +98,44 @@ installkernel() {
 }
 
 install() {
+    if dracut_module_included "systemd-initrd"; then
+        # TODO analyze qemu-nbd pivot-root bug!
+        inst_script "$moddir/services/dnbd3-generator.sh" \
+            $systemdutildir/system-generators/dnbd3-generator
+        inst "$moddir/hooks/pre-mount/prepare-root-partition.sh" \
+            /sbin/dnbd3root
+        inst "$moddir/hooks/pre-mount/fetch-config.sh" \
+            /sbin/fetch-config
+        #region old approach
+        #inst_simple "${moddir}/services/dnbd3root.service" \
+            #"${systemdsystemunitdir}/dnbd3root.service"
+        #mkdir -p "${initdir}/${systemdsystemunitdir}/sysinit.target.wants"
+        #ln_r "${systemdsystemunitdir}/dnbd3root.service" \
+            #"${systemdsystemunitdir}/sysinit.target.wants/dnbd3root.service"
+        # don't kill at switch_root
+        #mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-root-fs.target.wants"
+        #ln_r "${systemdsystemunitdir}/dnbd3root.service" \
+            #"${systemdsystemunitdir}/initrd-root-fs.target.wants/dnbd3root.service"
+        # todo don't kill after switch_root
+        #works if initrd-root-fs wants dnbd3.service (on /sysroot)
+        #endregion
+    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/pre-mount/fetch-config.sh"
+        # make the final blockdevice for the root system (dnbd3 -> qemu-nbd ->
+        # device-mapper)
+        inst_hook pre-mount 10 "$moddir/hooks/pre-mount/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
 
@@ -115,13 +148,6 @@ install() {
     # load nbd.ko, dnbd3.ko
     inst_hook pre-udev 00 "$moddir/hooks/pre-udev/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/pre-mount/fetch-config.sh"
-    # make the final blockdevice for the root system (dnbd3 -> qemu-nbd ->
-    # device-mapper)
-    inst_hook pre-mount 10 "$moddir/hooks/pre-mount/prepare-root-partition.sh"
-
     inst_hook mount 10 "$moddir/hooks/mount/mount-root-device.sh"
 
     inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh"
@@ -135,18 +161,22 @@ install() {
     for file_path in "$moddir/scripts/rebash/"*; do
         inst "$file_path" "/usr/lib/rebash/$(basename "$file_path")"
     done
+
+    # TODO currently not used
     # This script is triggered by udev upon finding the right partitions for
     # persistent sessions.
-    inst "$moddir/scripts/prepare-persistent-disks" \
-        /sbin/prepare-persistent-disks
+    #inst "$moddir/scripts/prepare-persistent-disks" \
+        #/sbin/prepare-persistent-disks
 
     # endregion
 
     # region configuration files
 
+    # TODO currently not used
     # Udev rules detecting 44, 45, 46 partitions and running
     # "prepare-persistent-disks" to prepare persistent partitions.
-    inst "$moddir/udev/70-openslx-disk.rules" /etc/udev/rules.d/70-openslx-disk.rules
+    #inst "$moddir/udev/70-openslx-disk.rules" /etc/udev/rules.d/70-openslx-disk.rules
+
     # Use terminal readline settings from the template system.
     inst /etc/inputrc /etc/inputrc
 
@@ -156,10 +186,17 @@ install() {
     inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \
         lsmod sleep route wget find lsof strace chroot switch_root pivot_root \
         mount fdisk mkfs.xfs env busybox ps agetty \
-        insmod qemu-nbd blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
+        insmod blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
         blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
-        basename dirname sort
+        basename dirname sort diff mktemp nohup genfstab mountpoint qemu-img
     # Production:
-    # inst_multiple insmod qemu-nbd blockdev partx dmsetup cat cut awk tr \
+    # inst_multiple insmod blockdev partx dmsetup cat cut awk tr \
     #     losetup dd mkfs.ext4 grep
 }
+
+# region vim modline
+
+# vim: set tabstop=4 shiftwidth=4 expandtab:
+# vim: foldmethod=marker foldmarker=region,endregion:
+
+# endregion