18 files changed, 14 insertions, 29 deletions
diff --git a/testModule/binaries/systemd_preserve_process_marker b/testModule/binaries/systemd-preserve-process-marker
index 0181cd80..0181cd80 100755
--- a/testModule/binaries/systemd_preserve_process_marker
+++ b/testModule/binaries/systemd-preserve-process-marker
diff --git a/testModule/binaries/busybox b/testModule/debugging_tools/busybox
index 1212ae20..1212ae20 100755
--- a/testModule/binaries/busybox
+++ b/testModule/debugging_tools/busybox
diff --git a/testModule/binaries/dnbd3-client b/testModule/debugging_tools/dnbd3-client
index 76924b49..76924b49 100755
--- a/testModule/binaries/dnbd3-client
+++ b/testModule/debugging_tools/dnbd3-client
diff --git a/testModule/binaries/endless b/testModule/debugging_tools/endless
index de7a8c0a..de7a8c0a 100755
--- a/testModule/binaries/endless
+++ b/testModule/debugging_tools/endless
diff --git a/testModule/endless.c b/testModule/debugging_tools/endless.c
index 22c9bc50..22c9bc50 100644
--- a/testModule/endless.c
+++ b/testModule/debugging_tools/endless.c
diff --git a/testModule/binaries/nbd-client b/testModule/debugging_tools/nbd-client
index 7bb2207f..7bb2207f 100755
--- a/testModule/binaries/nbd-client
+++ b/testModule/debugging_tools/nbd-client
diff --git a/testModule/kernel_modules/nbd.ko.backup b/testModule/debugging_tools/nbd-debugging.ko
index e8c3f40f..47cf6cd6 100644
--- a/testModule/kernel_modules/nbd.ko.backup
+++ b/testModule/debugging_tools/nbd-debugging.ko
diff --git a/testModule/deprecated/network.functions b/testModule/debugging_tools/network.functions
index 89ca5a20..89ca5a20 100644
--- a/testModule/deprecated/network.functions
+++ b/testModule/debugging_tools/network.functions
diff --git a/testModule/binaries/qemu-nbd-systemd-mark b/testModule/debugging_tools/qemu-nbd-systemd-mark
index 26fefe9d..26fefe9d 100755
--- a/testModule/binaries/qemu-nbd-systemd-mark
+++ b/testModule/debugging_tools/qemu-nbd-systemd-mark
diff --git a/testModule/binaries/qemu-nbd-systemd-mark-alternate b/testModule/debugging_tools/qemu-nbd-systemd-mark-alternate
index 03c2a6b1..03c2a6b1 100755
--- a/testModule/binaries/qemu-nbd-systemd-mark-alternate
+++ b/testModule/debugging_tools/qemu-nbd-systemd-mark-alternate
diff --git a/testModule/deprecated/setup_network.sh b/testModule/debugging_tools/setup_network.sh
index 3b32a68c..3b32a68c 100644
--- a/testModule/deprecated/setup_network.sh
+++ b/testModule/debugging_tools/setup_network.sh
diff --git a/testModule/hooks/mount.sh b/testModule/hooks/mount.sh
index 93a11e7c..28958fb6 100755
--- a/testModule/hooks/mount.sh
+++ b/testModule/hooks/mount.sh
@@ -3,5 +3,5 @@ if [ $MOUNT_READY ]; then
 else
     export MOUNT_READY=true
     warn '............MOUNT.............'
-    #mount /dev/nbd0 /sysroot/TEST
+    mount /dev/nbd0 /sysroot
 fi
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
index 548e748d..ed36db84 100755
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -1,15 +1,16 @@
+#!/usr/bin/bash
+
 if [ $PRE_MOUNT_READY ]; then
     warn '............PRE-MOUNT ALREADY DONE.............'
 else
     export PRE_MOUNT_READY=true
     warn '............PRE-MOUNT.............'
-    #insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko
-    #local dnbd3_device_node="$(dnbd3-client -h 132.230.4.1 -i stage4/torben/test \
-    #    -r 1 -d /dev/dnbd0)"
-    #dnbd3_device_node='/dev/dnbd0'
-    #qemu-img create -f qcow2 -o backing_file="$dnbd3_device_node",backing_fmt=qcow2 /test.qcow2
-    qemu-img create -f qcow2 /run/test.qcow2 100M
+    insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko
+    local dnbd3_device_node="$(dnbd3-client -h 132.230.4.1 -i stage4/torben/test \
+        -r 1 -d /dev/dnbd0)"
+    dnbd3_device_node='/dev/dnbd0'
+    qemu-img create -f qcow2 -o backing_file="$dnbd3_device_node",backing_fmt=qcow2 /run/test.qcow2
     insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
-    /usr/bin/qemu-nbd-systemd-mark-alternate --connect=/dev/nbd0 /run/test.qcow2 --socket /run/qemu-nbd-TEST --aio=native
-    #--persistent
+    /usr/bin/qemu-nbd-systemd-mark-alternate --connect=/dev/nbd0 \
+        /run/test.qcow2 --socket /run/qemu-nbd-TEST
 fi
diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh
deleted file mode 100755
index fcc6a977..00000000
--- a/testModule/hooks/pre-pivot.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ $PRE_PIVOT_READY ]; then
-    warn '............PRE-PIVOT ALREADY DONE.............'
-else
-    export PRE_PIVOT_READY=true
-    warn '............PRE-PIVOT.............'
-    #mount /dev/nbd0 /sysroot/TEST/
-    # strace -ff -o /sysroot/log.txt -p PID
-fi
diff --git a/testModule/kernel_modules/nbd.ko b/testModule/kernel_modules/nbd.ko
index 47cf6cd6..e8c3f40f 100644
--- a/testModule/kernel_modules/nbd.ko
+++ b/testModule/kernel_modules/nbd.ko
diff --git a/testModule/kernel_modules/nbd.ko.old b/testModule/kernel_modules/nbd.ko.old
deleted file mode 100644
index 40b67a92..00000000
--- a/testModule/kernel_modules/nbd.ko.old
+++ /dev/null
diff --git a/testModule/module-setup.sh b/testModule/module-setup.sh
index 009941fd..e9bf84f8 100644
--- a/testModule/module-setup.sh
+++ b/testModule/module-setup.sh
@@ -5,7 +5,7 @@ check() {
 }
 
 depends() {
-    echo base network rootfs-block bash kernel-modules debug systemd
+    echo base network bash kernel-modules
     return 0
 }
 
@@ -30,15 +30,8 @@ install() {
     # Loads globally needed useful functions or fixes some native dracut ones.
     inst "$moddir/library.sh" /usr/lib/test-library.sh
 
-    inst "$moddir/binaries/systemd_preserve_process_marker" /usr/bin/systemd_preserve_process_marker
-    inst "$moddir/binaries/endless" /usr/bin/endless
-    inst "$moddir/binaries/endless" /usr/bin/@endless
-    inst "$moddir/binaries/dnbd3-client" /usr/bin/dnbd3-client
-    inst "$moddir/binaries/busybox" /usr/bin/busybox
-    inst "$moddir/binaries/nbd-client" /usr/bin/nbd-client
+    inst "$moddir/binaries/systemd-preserve-process-marker" /usr/bin/systemd-preserve-process-marker
     inst "$moddir/binaries/qemu-nbd" /usr/bin/qemu-nbd
-    inst "$moddir/binaries/qemu-nbd" /usr/bin/@qemu-nbd
-    inst "$moddir/binaries/qemu-nbd-systemd-mark" /usr/bin/qemu-nbd-systemd-mark
     inst "$moddir/binaries/qemu-nbd-systemd-mark-alternate" /usr/bin/qemu-nbd-systemd-mark-alternate
 
     inst "$moddir/kernel_modules/dnbd3.ko" /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko
@@ -48,13 +41,12 @@ install() {
     # since we have to modify the some kernel parameter before.
     inst_hook cmdline 1 "$moddir/hooks/cmdline.sh"
     inst_hook pre-mount 10 "$moddir/hooks/pre-mount.sh"
-    inst_hook mount 10 "$moddir/hooks/mount.sh"
-    inst_hook pre-pivot 10 "$moddir/hooks/pre-pivot.sh"
+    # NOTE: Hook "mount" isn't executed on tested version.
+    inst_hook pre-pivot 10 "$moddir/hooks/mount.sh"
 
     inst_multiple lsblk ping ip ifconfig sshd htop dhclient tail head cat vim \
         touch sed lsmod insmod qemu-img sleep route wget find lsof strace \
         chroot switch_root pivot_root # qemu-nbd
     # Production: inst_multiple insmod qemu-img # qemu-nbd
-    #dracut_need_initqueue
     return 0
 }
diff --git a/testModule/systemd_preserve_process_marker.c b/testModule/systemd-preserve-process-marker.c
index 172a5546..172a5546 100644
--- a/testModule/systemd_preserve_process_marker.c
+++ b/testModule/systemd-preserve-process-marker.c