Rename dracut modules folder.

1 files changed, 9 insertions, 11 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" && \