Refactoring.

7 files changed, 15 insertions, 9 deletions

diff --git a/testModule/debugging_tools/dnbd3-client b/testModule/binaries/dnbd3-client
index 76924b49..76924b49 100755
--- a/testModule/debugging_tools/dnbd3-client
+++ b/testModule/binaries/dnbd3-client
diff --git a/testModule/debugging_tools/qemu-nbd-systemd-mark-alternate b/testModule/binaries/qemu-nbd-systemd-mark
index 03c2a6b1..03c2a6b1 100755
--- a/testModule/debugging_tools/qemu-nbd-systemd-mark-alternate
+++ b/testModule/binaries/qemu-nbd-systemd-mark
diff --git a/testModule/debugging_tools/qemu-nbd-systemd-mark b/testModule/debugging_tools/qemu-nbd-systemd-mark
index 26fefe9d..03c2a6b1 100755
--- a/testModule/debugging_tools/qemu-nbd-systemd-mark
+++ b/testModule/debugging_tools/qemu-nbd-systemd-mark
diff --git a/testModule/debugging_tools/setup_network.sh b/testModule/debugging_tools/setup-network.sh
index 3b32a68c..3b32a68c 100644
--- a/testModule/debugging_tools/setup_network.sh
+++ b/testModule/debugging_tools/setup-network.sh
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
index ed36db84..86fe94bf 100755
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -8,9 +8,12 @@ else
     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
+    # NOTE: Out comment this line if you need more than on dnbd0 device and
+    # determine it automatically.
+    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
+    /usr/bin/systemd-preserve-process-marker /usr/bin/qemu-nbd \
+        --connect=/dev/nbd0 /run/test.qcow2 --socket /run/qemu-nbd-TEST
 fi
diff --git a/testModule/module-setup.sh b/testModule/module-setup.sh
index e9bf84f8..fd6d51d7 100644
--- a/testModule/module-setup.sh
+++ b/testModule/module-setup.sh
@@ -30,12 +30,15 @@ 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/dnbd3-client" /usr/bin/dnbd3-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-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
-    inst "$moddir/kernel_modules/nbd.ko" /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
+    inst "$moddir/kernel_modules/dnbd3.ko" \
+        /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko
+    inst "$moddir/kernel_modules/nbd.ko" \
+        /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
 
     # NOTE: Priority has to be lower than the network cmdline parsing hooks
     # since we have to modify the some kernel parameter before.
diff --git a/testModule/systemd-preserve-process-marker.c b/testModule/systemd-preserve-process-marker.c
index 172a5546..2525bc5f 100644
--- a/testModule/systemd-preserve-process-marker.c
+++ b/testModule/systemd-preserve-process-marker.c
@@ -25,7 +25,7 @@ int main(int argc, char *argv[]) {
     copy[0][0] = '@';
     argv[0][0] = '@';
     if (-1 == execvp(argv[1], copy)) {
-        perror("child process execve failed [%m]");
+        perror("Executing child process failed.");
         return -1;
     }
 }