Rename dracut modules folder.

36 files changed, 15 insertions, 13 deletions

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index f10e9586..8687f3cb 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -52,6 +52,8 @@
 #                   as file name) for lines containing a match to the given
 #                   PATTERN. By default, grep prints the matching lines.
 
+source dnbd3-qcow2-rootfs
+
 __NAME__='build_initramfs'
 
 # endregion
@@ -75,9 +77,6 @@ function build_initramfs() {
         local dependencies=(bash cpio git test shift echo mktemp cat rm sed \
             gzip curl tar grep make cmake)
         "$_SCOPE" _DEPENDENCIES="${dependencies[*]}"
-        "$_SCOPE" _KERNEL_MODULE_DIRECTORY="builder/dnbd3-qcow2-rootfs/kernel_modules/"
-        "$_SCOPE" _STANDARD_OUTPUT=/dev/null
-        "$_SCOPE" _ERROR_OUTPUT=/dev/null
     fi
 
     # endregion
@@ -219,18 +218,17 @@ EOF
     # region controller
 
     if [[ "$0" == *"${__NAME__}.sh" ]]; then
-        build_initramfs_perform_dependency_check "${_DEPENDENCIES[*]}" || \
-            build_initramfs_log 'error' 'Satisfying main dependencies failed.'
+        utils_dependency_check "${_DEPENDENCIES[*]}" || \
+            utils_log 'error' 'Satisfying main dependencies failed.'
         build_initramfs_command_line_interface "$@" || return $?
 
-        build_initramfs_log 'Checking dracut.' && \
+        utils_log 'Checking dracut.' && \
         if ! [[ -d ./dracut ]]; then
-            build_initramfs_log "Dracut isn't available yet loading it." && \
-            build_initramfs_initialize_dracut
+            utils_log "Dracut isn't available yet loading it." && \
+            utils_initialize_dracut
         fi
-        build_initramfs_log 'Build initramfs.' && \
-        build_initramfs_log \
-            'Copy dnbd3 qcow2 plugin into dracut modules folder.' && \
+        utils_log 'Build initramfs.' && \
+        utils_log 'Copy dnbd3 qcow2 plugin into dracut modules folder.' && \
         cp --recursive builder/dnbd3-qcow2-rootfs/ \
             dracut/modules.d/90dndb3-qcow2-rootfs \
             1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/busybox/busybox b/builder/dnbd3-rootfs/binaries/busybox/busybox
index 7eceacf7..7eceacf7 100755
--- a/builder/dnbd3-qcow2-rootfs/binaries/busybox/busybox
+++ b/builder/dnbd3-rootfs/binaries/busybox/busybox
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/dnbd3 b/builder/dnbd3-rootfs/binaries/dnbd3
-Subproject c3c050851dc866f2311d33a262ed81af8c57ce2
+Subproject c3c050851dc866f2311d33a262ed81af8c57ce2
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.nbd.ko.cmd b/builder/dnbd3-rootfs/binaries/nbd/.nbd.ko.cmd
index 17386f08..17386f08 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.nbd.ko.cmd
+++ b/builder/dnbd3-rootfs/binaries/nbd/.nbd.ko.cmd
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.nbd.mod.o.cmd b/builder/dnbd3-rootfs/binaries/nbd/.nbd.mod.o.cmd
index 1248ea8a..1248ea8a 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.nbd.mod.o.cmd
+++ b/builder/dnbd3-rootfs/binaries/nbd/.nbd.mod.o.cmd
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.nbd.o.cmd b/builder/dnbd3-rootfs/binaries/nbd/.nbd.o.cmd
index b4c40a04..b4c40a04 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.nbd.o.cmd
+++ b/builder/dnbd3-rootfs/binaries/nbd/.nbd.o.cmd
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.tmp_versions/nbd.mod b/builder/dnbd3-rootfs/binaries/nbd/.tmp_versions/nbd.mod
index f2bc3309..f2bc3309 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/.tmp_versions/nbd.mod
+++ b/builder/dnbd3-rootfs/binaries/nbd/.tmp_versions/nbd.mod
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/Makefile b/builder/dnbd3-rootfs/binaries/nbd/Makefile
index ca0423f5..ca0423f5 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/Makefile
+++ b/builder/dnbd3-rootfs/binaries/nbd/Makefile
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/Module.symvers b/builder/dnbd3-rootfs/binaries/nbd/Module.symvers
index e69de29b..e69de29b 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/Module.symvers
+++ b/builder/dnbd3-rootfs/binaries/nbd/Module.symvers
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/modules.order b/builder/dnbd3-rootfs/binaries/nbd/modules.order
index 8f303a78..8f303a78 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/modules.order
+++ b/builder/dnbd3-rootfs/binaries/nbd/modules.order
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.c b/builder/dnbd3-rootfs/binaries/nbd/nbd.c
index 1b876233..1b876233 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.c
+++ b/builder/dnbd3-rootfs/binaries/nbd/nbd.c
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.ko b/builder/dnbd3-rootfs/binaries/nbd/nbd.ko
index 4829b5b6..4829b5b6 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.ko
+++ b/builder/dnbd3-rootfs/binaries/nbd/nbd.ko
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.mod.c b/builder/dnbd3-rootfs/binaries/nbd/nbd.mod.c
index 8e9bffe6..8e9bffe6 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.mod.c
+++ b/builder/dnbd3-rootfs/binaries/nbd/nbd.mod.c
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.mod.o b/builder/dnbd3-rootfs/binaries/nbd/nbd.mod.o
index 988957a2..988957a2 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.mod.o
+++ b/builder/dnbd3-rootfs/binaries/nbd/nbd.mod.o
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.o b/builder/dnbd3-rootfs/binaries/nbd/nbd.o
index 9da8e4d6..9da8e4d6 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/nbd/nbd.o
+++ b/builder/dnbd3-rootfs/binaries/nbd/nbd.o
diff --git a/builder/dnbd3-qcow2-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c b/builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
index 8f0fc108..8f0fc108 100644
--- a/builder/dnbd3-qcow2-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
+++ b/builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
diff --git a/builder/dnbd3-qcow2-rootfs/debugging-tools/endless b/builder/dnbd3-rootfs/debugging-tools/endless
index de7a8c0a..de7a8c0a 100755
--- a/builder/dnbd3-qcow2-rootfs/debugging-tools/endless
+++ b/builder/dnbd3-rootfs/debugging-tools/endless
diff --git a/builder/dnbd3-qcow2-rootfs/debugging-tools/endless.c b/builder/dnbd3-rootfs/debugging-tools/endless.c
index 22c9bc50..22c9bc50 100644
--- a/builder/dnbd3-qcow2-rootfs/debugging-tools/endless.c
+++ b/builder/dnbd3-rootfs/debugging-tools/endless.c
diff --git a/builder/dnbd3-qcow2-rootfs/debugging-tools/network.functions b/builder/dnbd3-rootfs/debugging-tools/network.functions
index 89ca5a20..89ca5a20 100644
--- a/builder/dnbd3-qcow2-rootfs/debugging-tools/network.functions
+++ b/builder/dnbd3-rootfs/debugging-tools/network.functions
diff --git a/builder/dnbd3-qcow2-rootfs/debugging-tools/setup-network.sh b/builder/dnbd3-rootfs/debugging-tools/setup-network.sh
index 3b32a68c..3b32a68c 100644
--- a/builder/dnbd3-qcow2-rootfs/debugging-tools/setup-network.sh
+++ b/builder/dnbd3-rootfs/debugging-tools/setup-network.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/cmdline/enable-sysrq.sh b/builder/dnbd3-rootfs/hooks/cmdline/enable-sysrq.sh
index f779aa7a..f779aa7a 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/cmdline/enable-sysrq.sh
+++ b/builder/dnbd3-rootfs/hooks/cmdline/enable-sysrq.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh b/builder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh
index 9f617b09..9f617b09 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh
+++ b/builder/dnbd3-rootfs/hooks/cmdline/prepare-network-kcl-parameter.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/cmdline/set-dracut-environment-variables.sh b/builder/dnbd3-rootfs/hooks/cmdline/set-dracut-environment-variables.sh
index 6deeb78f..6deeb78f 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/cmdline/set-dracut-environment-variables.sh
+++ b/builder/dnbd3-rootfs/hooks/cmdline/set-dracut-environment-variables.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/mount/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh
index f0d48174..f0d48174 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/mount/mount-root-device.sh
+++ b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/fetch-config.sh b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh
index a90481c8..a90481c8 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/fetch-config.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/mount-qcow.sh b/builder/dnbd3-rootfs/hooks/pre-mount/mount-qcow.sh
index d70492bf..d70492bf 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/mount-qcow.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/mount-qcow.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
index 8b5ea48e..8b5ea48e 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/pre-mount/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/pre-pivot/mount-tmp.sh b/builder/dnbd3-rootfs/hooks/pre-pivot/mount-tmp.sh
index 3e702064..3e702064 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/pre-pivot/mount-tmp.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-pivot/mount-tmp.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh
index 29f9f210..29f9f210 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh
diff --git a/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/setup-loopback-device.sh b/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh
index 9103afd9..9103afd9 100755
--- a/builder/dnbd3-qcow2-rootfs/hooks/pre-udev/setup-loopback-device.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh
diff --git a/builder/dnbd3-qcow2-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index b9134871..b9134871 100755
--- a/builder/dnbd3-qcow2-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
diff --git a/builder/dnbd3-qcow2-rootfs/readme.md b/builder/dnbd3-rootfs/readme.md
index 9ad0f968..9ad0f968 100644
--- a/builder/dnbd3-qcow2-rootfs/readme.md
+++ b/builder/dnbd3-rootfs/readme.md
diff --git a/builder/dnbd3-qcow2-rootfs/scripts/prepare-disks b/builder/dnbd3-rootfs/scripts/prepare-disks
index 2e68dd9e..2e68dd9e 100755
--- a/builder/dnbd3-qcow2-rootfs/scripts/prepare-disks
+++ b/builder/dnbd3-rootfs/scripts/prepare-disks
diff --git a/builder/dnbd3-qcow2-rootfs/scripts/setup-qcow2 b/builder/dnbd3-rootfs/scripts/setup-qcow2
index 70babc17..70babc17 100755
--- a/builder/dnbd3-qcow2-rootfs/scripts/setup-qcow2
+++ b/builder/dnbd3-rootfs/scripts/setup-qcow2
diff --git a/builder/dnbd3-qcow2-rootfs/scripts/utils.sh b/builder/dnbd3-rootfs/scripts/utils.sh
index 0e0c9479..3c72dbca 100644
--- a/builder/dnbd3-qcow2-rootfs/scripts/utils.sh
+++ b/builder/dnbd3-rootfs/scripts/utils.sh
@@ -1,4 +1,8 @@
-function log() {
+UTILS_KERNEL_MODULE_DIRECTORY="builder/dnbd3-qcow2-rootfs/kernel_modules/"
+UTILS_STANDARD_OUTPUT=/dev/null
+UTILS_ERROR_OUTPUT=/dev/null
+
+function utils_log() {
     # Handles logging messages. Returns non zero and exit on log level
     # error to support chaining the message into toolchain.
     #
@@ -74,7 +78,7 @@ function compile_systemd_preserve_process_marker() {
     popd
     return $?
 }
-function perform_dependency_check() {
+function utils_dependency_check() {
     # This function check if all given dependencies are present.
     #
     # Examples:
diff --git a/builder/dnbd3-qcow2-rootfs/udev/70-openslx-disk.rules b/builder/dnbd3-rootfs/udev/70-openslx-disk.rules
index 5cb3fa52..5cb3fa52 100644
--- a/builder/dnbd3-qcow2-rootfs/udev/70-openslx-disk.rules
+++ b/builder/dnbd3-rootfs/udev/70-openslx-disk.rules