From 6273cc8d2ee43b7c53e348bc8fba18bddd53c335 Mon Sep 17 00:00:00 2001
From: torben
Date: Thu, 7 Jan 2016 17:27:58 +0100
Subject: Fix moddir generation.

---
 builder/build-initramfs.sh           | 9 ++++-----
 builder/dnbd3-rootfs/module-setup.sh | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'builder')

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"
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 87484fb3..c39119ea 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -128,7 +128,6 @@ install() {
         inst_hook pre-mount 10 "$moddir/hooks/pre-mount/prepare-root-partition.sh"
     fi
 
-
     # region binaries
 
     inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/bin/dnbd3-client
@@ -185,7 +184,7 @@ install() {
     # Debugging:
     inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \
         lsmod sleep route wget find lsof strace chroot switch_root pivot_root \
-        mount fdisk mkfs.xfs env busybox ps agetty \
+        mount fdisk mkfs.xfs env busybox ps agetty tree \
         insmod blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
         blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
         basename dirname sort mktemp diff qemu-img
-- 
cgit v1.2.3-55-g7522