summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorTiago2014-07-11 20:04:12 +0200
committerMichael Pereira Neves2014-10-28 14:19:55 +0100
commit5bf434d63342ffbbb052c02e647f4cdd3a0daa8b (patch)
tree9d7671386918fabf9e3ae14cc149de97111bd1f3 /remote/modules
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-5bf434d63342ffbbb052c02e647f4cdd3a0daa8b.tar.gz
tm-scripts-5bf434d63342ffbbb052c02e647f4cdd3a0daa8b.tar.xz
tm-scripts-5bf434d63342ffbbb052c02e647f4cdd3a0daa8b.zip
[dnbd3-cache]include dnbd-server add service file
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service3
-rw-r--r--remote/modules/dnbd3/module.build5
-rw-r--r--remote/modules/dnbd3/module.conf1
3 files changed, 7 insertions, 2 deletions
diff --git a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
index 516cbfa2..7d34480d 100644
--- a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
+++ b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
@@ -1,6 +1,5 @@
[Unit]
Description=Setup dnbd3 kernel module and user space daemon
-After=sysinit.target
Before=shutdown.target
DefaultDependencies=no
@@ -9,3 +8,5 @@ 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/remote/modules/dnbd3/module.build b/remote/modules/dnbd3/module.build
index cdbd8251..fd56b4f7 100644
--- a/remote/modules/dnbd3/module.build
+++ b/remote/modules/dnbd3/module.build
@@ -27,13 +27,16 @@ build() {
cd "$MODULE_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 "Coould not create opt/openslx/bin"
+ mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not create opt/openslx/bin"
cp "$MODULE_DIR/src/kmod/dnbd3.ko" "$MODULE_BUILD_DIR/lib/modules/dnbd3/" || perror "could not cp dnbd3.ko"
cd "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not cd to build dir for client binary"
cmake "$MODULE_DIR/src/dnbd3" || perror "Could not cmake"
make dnbd3-client || perror "Could not make dnbd3-client"
chown root:root "dnbd3-client"
chmod +xs "dnbd3-client"
+ make dnbd3-server || perror "Could not make dnbd3-server"
+ chown root:root "dnbd3-server"
+ chmod +xs "dnbd3-server"
cd "$MODULE_DIR"
}
diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf
index 631b0e23..f917b1b4 100644
--- a/remote/modules/dnbd3/module.conf
+++ b/remote/modules/dnbd3/module.conf
@@ -5,6 +5,7 @@ REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
REQUIRED_COMMIT="bc4ee543ce5beec823ae0cbd811bb7febe43103f"
REQUIRED_BINARIES="
dnbd3-client
+ dnbd3-server
"
REQUIRED_DIRECTORIES="
/lib/modules