From: Ralf Jung <post@ralfj.de>
Date: Sun, 23 Mar 2014 13:15:52 +0000 (+0100)
Subject: Load cuse module via module-load.d
X-Git-Tag: debian/1.3.2-6~2
X-Git-Url: https://git.ralfj.de/osspd.git/commitdiff_plain/75c0000d847834273a00a12f6fc5a3f6e6e6270f?ds=sidebyside;hp=00a0a319119c399bee6691af1bbc33c2edc45f4e

Load cuse module via module-load.d

On branch master
Changes not staged for commit:
	deleted:    debian/osspd.conf
Untracked files:
	debian/osspd.kmod
no changes added to commit (use "git add" and/or "git commit -a")
---

diff --git a/debian/changelog b/debian/changelog
index b46f617..9557027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osspd (1.3.2-6) UNRELEASED; urgency=medium
+
+  * Load cuse module via module-load.d
+
+ -- Ralf Jung <post@ralfj.de>  Sun, 23 Mar 2014 14:14:43 +0100
+
 osspd (1.3.2-5) unstable; urgency=low
 
   * Fix systemd service file.
diff --git a/debian/osspd.init b/debian/osspd.init
index 77922b6..8669c76 100644
--- a/debian/osspd.init
+++ b/debian/osspd.init
@@ -32,7 +32,6 @@ SCRIPTNAME=/etc/init.d/$NAME
 #
 do_start()
 {
-	modprobe cuse # make sure the cuse module is loaded
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
diff --git a/debian/osspd.kmod b/debian/osspd.kmod
new file mode 100644
index 0000000..e1bacaf
--- /dev/null
+++ b/debian/osspd.kmod
@@ -0,0 +1,2 @@
+# Load cuse module for osspd
+cuse
diff --git a/debian/osspd.service b/debian/osspd.service
index 5d76828..1105290 100644
--- a/debian/osspd.service
+++ b/debian/osspd.service
@@ -2,7 +2,6 @@
 Description=OSS Proxy Daemon
 
 [Service]
-ExecStartPre=/sbin/modprobe cuse
 ExecStart=/usr/sbin/osspd -f --dsp-slave=/usr/lib/osspd/ossp-slave
 
 [Install]
diff --git a/debian/rules b/debian/rules
index 80bfd48..08a8973 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@ override_dh_installdocs:
 
 override_dh_install:
 	dh_install --fail-missing
+	# adding kmod integration
+	install -D -m 0644 debian/osspd.kmod debian/osspd/lib/modules-load.d/osspd.conf
 
 # Disable tests, they require running the osspd
 override_dh_auto_test: