Resolve name clashing problem.

2 files changed, 21 insertions, 21 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index c5ae766a..9101851c 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-source $(dirname ${BASH_SOURCE[0]})/scripts/rebash/core.sh
+source "$(dirname "${BASH_SOURCE[0]}")/scripts/rebash/core.sh"
 core.import exceptions
-exceptions.activate
-core.import $(dirname ${BASH_SOURCE[0]})/scripts/build-functions.sh
 core.import logging
+core.import utils
+
 # TODO set log level via dracut logging options
 logging.set_log_level 'info'
 logging.set_commands_log_level 'info'
-core.import utils
-exceptions.deactivate
+
+core.import "$(dirname "${BASH_SOURCE[0]}")/scripts/build.sh"
 
 clean() {
     # NOTE: This method is currently triggered manually and not supported by
diff --git a/builder/dnbd3-rootfs/scripts/build-functions.sh b/builder/dnbd3-rootfs/scripts/build.sh
index 3a56d32b..fc1cfd62 100644
--- a/builder/dnbd3-rootfs/scripts/build-functions.sh
+++ b/builder/dnbd3-rootfs/scripts/build.sh
@@ -1,12 +1,12 @@
 source "$(dirname "${BASH_SOURCE[0]}")/rebash/core.sh"
 core.import logging
 
-function utils_compile_nbd() {
+function build_compile_nbd() {
     # Downloads and compiles nbd.
     #
     # Examples:
     #
-    # >>> utils_compile_nbd path/to/nbd/directory/
+    # >>> build_compile_nbd path/to/nbd/directory/
     # ...
     # Provides the following file:
     # "$1/nbd.ko"
@@ -16,12 +16,12 @@ function utils_compile_nbd() {
     popd
     return $?
 }
-function utils_clean_nbd() {
+function build_clean_nbd() {
     # Cleans nbd specific generated files
     #
     # Examples:
     #
-    # >>> utils_clean_nbd path/to/nbd/directory/
+    # >>> build_clean_nbd path/to/nbd/directory/
     # ...
     # Removes the following file:
     # "$1/nbd.ko"
@@ -30,12 +30,12 @@ function utils_clean_nbd() {
     popd
     return $?
 }
-function utils_compile_dnbd3() {
+function build_compile_dnbd3() {
     # Downloads and compiles dnbd3.
     #
     # Examples:
     #
-    # >>> utils_compile_dnbd3 path/to/dnbd3/directory/
+    # >>> build_compile_dnbd3 path/to/dnbd3/directory/
     # ...
     # Provides the following file:
     # "$1/build/dnbd3.ko"
@@ -47,46 +47,46 @@ function utils_compile_dnbd3() {
     popd
     return $?
 }
-function utils_clean_dnbd3() {
+function build_clean_dnbd3() {
     # Removes generated dnbd3 specific files.
     #
     # Examples:
     #
-    # >>> utils_clean_dnbd3 path/to/dnbd3/directory/
+    # >>> build_clean_dnbd3 path/to/dnbd3/directory/
     # ...
     # Removes the following directory:
     # "$1/build"
     rm --recursive --force "$1/build"
     return $?
 }
-function utils_compile_systemd_preserve_process_marker() {
+function build_compile_systemd_preserve_process_marker() {
     # Compiles simple c program.
     #
     # Examples:
     #
-    # >>> utils_compile_systemd_preserve_process_marker path/to/program/folder
+    # >>> build_compile_systemd_preserve_process_marker path/to/program/folder
     pushd "$1"
     make
     popd
     return $?
 }
-function utils_clean_systemd_preserve_process_marker() {
+function build_clean_systemd_preserve_process_marker() {
     # Removes compiled simple c program.
     #
     # Examples:
     #
-    # >>> utils_clean_systemd_preserve_process_marker path/to/program/folder
+    # >>> build_clean_systemd_preserve_process_marker path/to/program/folder
     pushd "$1"
     make clean
     popd
     return $?
 }
-function utils_dependency_check() {
+function build_dependency_check() {
     # This function check if all given dependencies are present.
     #
     # Examples:
     #
-    # >>> utils_dependency_check "mkdir pacstrap mktemp"
+    # >>> build_dependency_check "mkdir pacstrap mktemp"
     # ...
     local dependenciesToCheck="$1"
     local result=0
@@ -100,12 +100,12 @@ function utils_dependency_check() {
     done
     return $result
 }
-function utils_mount_partition() {
+function build_mount_partition() {
     # Mounts a partition at given offset.
     #
     # Examples:
     #
-    # >>> utils_mount_partition /dev/DEVICE_NAME PARTITION_IDENTIFIER
+    # >>> build_mount_partition /dev/DEVICE_NAME PARTITION_IDENTIFIER
     # ...
     local device="$1"
     local partition_identifier="$2"