From dad40ac3f1ee8bbbb180bb3c9a1b575a98126600 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 18 Feb 2016 14:34:53 +0100
Subject: [dnbd3] Include dnbd3-fuse

---
 remote/modules/dnbd3/module.build       | 4 +++-
 remote/modules/dnbd3/module.conf        | 5 ++---
 remote/modules/dnbd3/module.conf.ubuntu | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/remote/modules/dnbd3/module.build b/remote/modules/dnbd3/module.build
index cdbd8251..1594b9ab 100644
--- a/remote/modules/dnbd3/module.build
+++ b/remote/modules/dnbd3/module.build
@@ -32,8 +32,10 @@ build() {
 	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"
+	make dnbd3-fuse || perror "Could not make dnbd3-fuse"
+	chown root:root "dnbd3-client" "dnbd3-fuse"
 	chmod +xs "dnbd3-client"
+	chmod +x "dnbd3-fuse"
 	cd "$MODULE_DIR"
 }
 
diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf
index a0729107..29442db7 100644
--- a/remote/modules/dnbd3/module.conf
+++ b/remote/modules/dnbd3/module.conf
@@ -1,10 +1,9 @@
-#REQUIRED_INSTALLED_PACKAGES="libgconf-2-4 fontconfig-config"
-#REQUIRED_CONTENT_PACKAGES="libgconf-2-4 fontconfig-config"
 REQUIRED_MODULES="kernel"
 REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
-REQUIRED_COMMIT="c3c050851dc866f2311d33a262ed81af8c57ce22"
+REQUIRED_COMMIT="6d6455b271ac99c5862691620e1217ed7b3b78b4"
 REQUIRED_BINARIES="
 	dnbd3-client
+	dnbd3-fuse
 "
 REQUIRED_DIRECTORIES="
 	/lib/modules
diff --git a/remote/modules/dnbd3/module.conf.ubuntu b/remote/modules/dnbd3/module.conf.ubuntu
index d303245c..8033437b 100644
--- a/remote/modules/dnbd3/module.conf.ubuntu
+++ b/remote/modules/dnbd3/module.conf.ubuntu
@@ -1,8 +1,9 @@
 REQUIRED_CONTENT_PACKAGES="
-                                cmake
+				cmake
 "
 
 REQUIRED_INSTALLED_PACKAGES="
-                                cmake
+				cmake
 				zlib1g-dev
+				libfuse-dev
 "
-- 
cgit v1.2.3-55-g7522