Fix moddir generation.

1 files changed, 4 insertions, 5 deletions

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 76622a11..9e2feb92 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -297,10 +297,9 @@ function build_initramfs_cleanup() {
     # Examples:
     #
     # >>> build_initramfs_cleanup
-    source "$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs/module-setup.sh"
-    moddir="$(dirname "${BASH_SOURCE[0]}")$(dirname "$(readlink \
-        --canonicalize "$(dirname \
-        "${BASH_SOURCE[0]}")dnbd3-rootfs/module-setup.sh")")"
+    local plugin_path="$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs/"
+    source "${plugin_path}module-setup.sh"
+    moddir="$(cd "$plugin_path" &>/dev/null && pwd)"
     clean
     return $?
 }
@@ -398,7 +397,7 @@ then
     if ! ln --symbolic --force "$build_initramfs__dracut_modules_source" \
     "$build_initramfs__dracut_modules_target" 2>/dev/null; then
         logging.warn \
-            "Link \"$build_initramfs__dracut_modules_source\" to \"$build_initramfs__dracut_modules_target\" fails. We will copy them. So we have to recopy it every time to ensure that recompiled thinks take effect."
+            "Link \"$build_initramfs__dracut_modules_source\" to \"$build_initramfs__dracut_modules_target\" fails. We will copy them. So we have to recopy it every time to ensure that recompiled things take effect."
         cp --recursive --force --no-target-directory \
             "$(dirname "${BASH_SOURCE[0]}")/$(basename "$build_initramfs__dracut_modules_source")" \
             "$build_initramfs__dracut_modules_target"