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 b46f61748c996bc13f06b2432cadc29bff41b4c1..955702779775212292d9a00394dae42c03d6b7cd 100644 (file)
--- 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.
 osspd (1.3.2-5) unstable; urgency=low
 
   * Fix systemd service file.

diff --git a/debian/osspd.init b/debian/osspd.init
index 77922b60ed28398aae6362405e98919ef9d63272..8669c76069753ff4a6689b6cfdcce4f48b493bfd 100644 (file)
--- a/debian/osspd.init
+++ b/debian/osspd.init
@@ -32,7 +32,6 @@ SCRIPTNAME=/etc/init.d/$NAME
 #
 do_start()
 {
 #
 do_start()
 {

-       modprobe cuse # make sure the cuse module is loaded

        # Return
        #   0 if daemon has been started
        #   1 if daemon was already running
        # 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 (file)
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 5d76828a0cd748b08b9e410ee358ece1c1f412ce..1105290df792af93121f74df1fa0ad3964862a4d 100644 (file)
--- a/debian/osspd.service
+++ b/debian/osspd.service
@@ -2,7 +2,6 @@
 Description=OSS Proxy Daemon
 
 [Service]
 Description=OSS Proxy Daemon
 
 [Service]

-ExecStartPre=/sbin/modprobe cuse

 ExecStart=/usr/sbin/osspd -f --dsp-slave=/usr/lib/osspd/ossp-slave
 
 [Install]
 ExecStart=/usr/sbin/osspd -f --dsp-slave=/usr/lib/osspd/ossp-slave
 
 [Install]

diff --git a/debian/rules b/debian/rules
index 80bfd4839e05e00a4a0c3452b31ad6c24b1146ee..08a897387975b58ac468fde5b1cbd3cc56faa59f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@ override_dh_installdocs:
 
 override_dh_install:
        dh_install --fail-missing
 
 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:
 
 # Disable tests, they require running the osspd
 override_dh_auto_test: