From 4af11cb9f54a500eae2fdfe03f8a4a35c093c784 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 31 Jul 2020 12:34:24 +0200
Subject: [dnbd3] Remove kernel module, to be built as dracut module

---
 .../data/etc/systemd/system/setup-dnbd3.service    | 11 ---------
 .../sysinit.target.wants/setup-dnbd3.service       |  1 -
 .../data/opt/openslx/scripts/systemd-setup_dnbd3   | 18 ---------------
 core/modules/dnbd3/module.build                    | 27 +---------------------
 core/modules/dnbd3/module.conf                     |  2 --
 5 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 core/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
 delete mode 120000 core/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service
 delete mode 100755 core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3

(limited to 'core/modules/dnbd3')

diff --git a/core/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/core/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
deleted file mode 100644
index 516cbfa2..00000000
--- a/core/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Setup dnbd3 kernel module and user space daemon
-After=sysinit.target
-Before=shutdown.target
-DefaultDependencies=no
-
-[Service]
-ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3
-ExecStop=/opt/openslx/bin/dnbd3-client --kill
-ExecStopPost=/opt/openslx/bin/rm /var/run/dnbd3.socket
-Restart=on-abort
diff --git a/core/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service b/core/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service
deleted file mode 120000
index 05dd4ac2..00000000
--- a/core/modules/dnbd3/data/etc/systemd/system/sysinit.target.wants/setup-dnbd3.service
+++ /dev/null
@@ -1 +0,0 @@
-../setup-dnbd3.service
\ No newline at end of file
diff --git a/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3 b/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
deleted file mode 100755
index 44753f84..00000000
--- a/core/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/ash
-
-export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin
-
-if ! ( lsmod | grep -q dnbd3 ||  modprobe dnbd3 ); then
-	slxlog "dnbd3-kernel" "Error loading dnbd3 client kernel module"
-	exit 1
-fi
-
-[ -e "/dev/dnbd0" ] || exit 1
-for i in /dev/dnbd*; do
-	echo 8192 > "/sys/block/dnbd${i#/dev/dnbd}/queue/nr_requests"
-done
-
-exec dnbd3-client --daemon
-slxlog "dnbd3-daemon" "Error launching dnbd3-client daemon"
-exit 1
-
diff --git a/core/modules/dnbd3/module.build b/core/modules/dnbd3/module.build
index 5f049e97..203088ca 100644
--- a/core/modules/dnbd3/module.build
+++ b/core/modules/dnbd3/module.build
@@ -1,48 +1,23 @@
 #!/bin/bash
 fetch_source() {
-	mkdir -p "src/kmod"
 	autoclone
-	cp src/dnbd3/Kbuild.in src/dnbd3/src/*.{c,h} src/dnbd3/src/kernel/*.{c,h} src/kmod/ || perror "Could not copy kernel module source files"
-	cat > "src/kmod/Makefile" <<HEREEND
-include \$(PWD)/Kbuild.in
-
-ifndef KDIR
-	KDIR = /lib/modules/\$(shell uname -r)/build
-endif
-
-all:
-	make -C "\$(KDIR)" "M=\$(PWD)" modules
-
-clean:
-	make -C "\$(KDIR)" "M=\$(PWD)" clean
-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/${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 \
+		-DBUILD_KERNEL_MODULE=OFF \
 		-DBUILD_SERVER=ON \
 		-DBUILD_SERVER_FUSE=ON \
 		-DBUILD_STRESSTEST=OFF \
 		"$MODULE_WORK_DIR/src/dnbd3" || perror "Could not cmake"
-	make dnbd3-client || perror "Could not make dnbd3-client"
 	make dnbd3-fuse || perror "Could not make dnbd3-fuse"
 	make dnbd3-server || perror "Could not make dnbd3-server"
 	chown root:root "dnbd3-client" "dnbd3-fuse" "dnbd3-server"
-	chmod +xs "dnbd3-client"
 	chmod +x "dnbd3-fuse" "dnbd3-server"
 	add_group "fuse"
 	cd "$MODULE_WORK_DIR"
diff --git a/core/modules/dnbd3/module.conf b/core/modules/dnbd3/module.conf
index a21ace25..2da97d48 100644
--- a/core/modules/dnbd3/module.conf
+++ b/core/modules/dnbd3/module.conf
@@ -2,11 +2,9 @@
 REQUIRED_MODULES="kernel"
 REQUIRED_GIT="https://git.openslx.org/dnbd3.git||fuse_ll"
 REQUIRED_BINARIES="
-	dnbd3-client
 	dnbd3-fuse
 	fusermount
 	dnbd3-server
 "
 REQUIRED_DIRECTORIES="
-	/lib/modules
 "
-- 
cgit v1.2.3-55-g7522