Fix utils.

1 files changed, 27 insertions, 25 deletions

diff --git a/builder/dnbd3-rootfs/scripts/utils.sh b/builder/dnbd3-rootfs/scripts/utils.sh
index 3c72dbca..66d370ba 100644
--- a/builder/dnbd3-rootfs/scripts/utils.sh
+++ b/builder/dnbd3-rootfs/scripts/utils.sh
@@ -1,6 +1,6 @@
-UTILS_KERNEL_MODULE_DIRECTORY="builder/dnbd3-qcow2-rootfs/kernel_modules/"
 UTILS_STANDARD_OUTPUT=/dev/null
 UTILS_ERROR_OUTPUT=/dev/null
+UTILS_VERBOSE=false
 
 function utils_log() {
     # Handles logging messages. Returns non zero and exit on log level
@@ -21,7 +21,7 @@ function utils_log() {
         loggingType="$1"
         message="$2"
     fi
-    if [ "$_VERBOSE" == 'yes' ] || [ "$loggingType" == 'error' ] || \
+    if [ "$UTILS_VERBOSE" == 'yes' ] || [ "$loggingType" == 'error' ] || \
        [ "$loggingType" == 'critical' ]; then
         if [ "$3" ]; then
             echo -e -n "$3"
@@ -33,49 +33,51 @@ function utils_log() {
     fi
     return 0
 }
-function compile_nbd() {
+function utils_compile_nbd() {
     # Downloads and compiles nbd.
     #
     # Examples:
     #
-    # >>> build_initramfs_compile_nbd
+    # >>> build_initramfs_compile_nbd path/to/nbd/directory/
     # ...
     # Provides the following file:
-    # ${_KERNEL_MODULE_DIRECTORY}/nbd/nbd.ko
-    pushd "${_KERNEL_MODULE_DIRECTORY}/nbd" \
-        1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-    build_initramfs_log 'Compile the nbd kernel module.' && \
-    make 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-    popd 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT"
+    # "$1/nbd.ko"
+    pushd "$1" 1>"$UTILS_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
+    utils_log 'Compile the nbd kernel module.' && \
+    make 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+    popd 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
     return $?
     # TODO make clean
 }
-function compile_dnbd3() {
+function utils_compile_dnbd3() {
     # Downloads and compiles dnbd3.
     #
     # Examples:
     #
-    # >>> build_initramfs_compile_dnbd3
+    # >>> build_initramfs_compile_dnbd3 path/to/dnbd3/directory/
     # ...
     # Provides the following file:
-    # ${_KERNEL_MODULE_DIRECTORY}/dnbd3/build/dnbd3.ko
-    rm --recursive --force ${_KERNEL_MODULE_DIRECTORY}/dnbd3 \
-        1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-    pushd $_KERNEL_MODULE_DIRECTORY \
-        1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
+    # "$1/build/dnbd3.ko"
+    rm --recursive --force "$1" 1>"$UTILS_STANDARD_OUTPUT" \
+        2>"$UTILS_ERROR_OUTPUT" && \
+    pushd "$1" 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
     git clone git://git.openslx.org/dnbd3.git \
-        1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-    cd dnbd3 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-    ./build.sh 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \
-    popd 1>"$_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT"
+        1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+    cd dnbd3 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+    ./build.sh 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+    popd 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
     return $?
     # TODO rm -rf build
 }
 function compile_systemd_preserve_process_marker() {
     # Compiles simple c program.
-    pushd && \
-    make && \
-    popd
+    #
+    # Examples:
+    #
+    # >>> utils_compile_systemd_preserve_process_marker path/to/program/folder
+    pushd "$1" 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+    make 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
+    popd 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
     return $?
 }
 function utils_dependency_check() {
@@ -83,7 +85,7 @@ function utils_dependency_check() {
     #
     # Examples:
     #
-    # >>> build_initramfs_perform_dependency_check "mkdir pacstrap mktemp"
+    # >>> utils_dependency_check "mkdir pacstrap mktemp"
     # ...
     local dependenciesToCheck="$1" && \
     local result=0 && \