From fe94c8cb647f81862d036b129e051a198051d325 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 1 Aug 2019 16:04:17 +0200
Subject: [dnbd3] move kernel module to its proper location

---
 .../dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3 |  2 +-
 core/modules/dnbd3/module.build                        | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'core/modules/dnbd3')

diff --git a/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3 b/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
index bb47bfc6..7d237069 100755
--- a/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
+++ b/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
@@ -2,7 +2,7 @@
 
 export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin
 
-if ! insmod /lib/modules/dnbd3/dnbd3.ko; then
+if ! ( lsmod | grep -q dnbd3 ||  modprobe dnbd3.ko ); then
 	slxlog "dnbd3-kernel" "Error loading dnbd3 client kernel module"
 	exit 1
 fi
diff --git a/core/modules/dnbd3/module.build b/core/modules/dnbd3/module.build
index 5cba9ae1..67411ca6 100644
--- a/core/modules/dnbd3/module.build
+++ b/core/modules/dnbd3/module.build
@@ -25,12 +25,18 @@ HEREEND
 }
 
 build() {
-	cd "$MODULE_WORK_DIR/src/kmod" || perror "Could not CD to standalone dnbd3 kmod dir"
-	make MODULE_NAME=dnbd3 KDIR="$KERNEL_HEADERS_DIR" || perror "Could not compile kernel module"
-	mkdir -p "$MODULE_BUILD_DIR/lib/modules/dnbd3" || perror "Could not create lib/modules/dnbd3"
-	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not create opt/openslx/bin"
-	cp "$MODULE_WORK_DIR/src/kmod/dnbd3.ko" "$MODULE_BUILD_DIR/lib/modules/dnbd3/" || perror "Could not copy dnbd3.ko"
-	cd "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not cd to build dir for client binary"
+	cd "${MODULE_WORK_DIR}/src/kmod" \
+		|| perror "Could not CD to standalone dnbd3 kmod dir"
+	make MODULE_NAME=dnbd3 KDIR="$KERNEL_HEADERS_DIR" \
+		|| perror "Could not compile kernel module"
+	mkdir -p "${MODULE_BUILD_DIR}/lib/modules/${TARGET_KERNEL_LONG}/kernel/drivers/block" \
+		|| perror "Could not create lib/modules/${TARGET_KERNEL_LONG}/kernel/drivers/block"
+	mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/bin" \
+		|| perror "Could not create opt/openslx/bin"
+	cp "${MODULE_WORK_DIR}/src/kmod/dnbd3.ko" "${MODULE_BUILD_DIR}/lib/modules/${TARGET_KERNEL_LONG}/kernel/drivers/block/" \
+		|| perror "Could not copy dnbd3.ko"
+	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" \
+		|| perror "Could not cd to build dir for client binary"
 	cmake \
 		-DBUILD_FUSE_CLIENT=ON \
 		-DBUILD_KERNEL_MODULE=ON \
-- 
cgit v1.2.3-55-g7522