Cleanup refactoring. Evaluate minimal needed dependencies.

1 files changed, 4 insertions, 12 deletions

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
 }