Split off /etc/defaults/sasc-ng-common file; install to /usr/sbin

diff --git a/debian/sasc-ng-common.default b/debian/sasc-ng-common.default
new file mode 100755 (executable)
index 0000000..648f1a3
--- /dev/null
+++ b/debian/sasc-ng-common.default
@@ -0,0 +1,15 @@
+# Default settings for sasc-ng. This file is sourced by /bin/sh from
+# /etc/init.d/sasc-ng-common.
+
+PIDFILE=/var/run/$NAME.pid
+LOGFILE=/var/log/$NAME.log
+
+ADDITIONAL_DVBLOOPBACK_PARAMS="adapter_nr=1"
+
+NUM_LOOPBACK_ADAPTERS=1
+DAEMON_JOIN_ARGS="--join 0:1"
+DEBUG_MASK=0
+
+# Using a log file seems to cause segfaults, use syslog instead
+#DAEMON_ARGS="$DAEMON_JOIN_ARGS --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --sid-experimental --daemon --pidfile $PIDFILE --debug $DEBUG_MASK --log $LOGFILE"
+DAEMON_ARGS="$DAEMON_JOIN_ARGS --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --sid-experimental --daemon --pidfile $PIDFILE --debug $DEBUG_MASK"

diff --git a/debian/sasc-ng-common.init b/debian/sasc-ng-common.init
index 9865e8b4f826df3e352b2fe9d3dc2a0a365f69a2..cbfa0bbd3278fbed193b0ad5b6b9ef7d15c71a2b 100755 (executable)
--- a/debian/sasc-ng-common.init
+++ b/debian/sasc-ng-common.init
@@ -1,13 +1,12 @@
 #! /bin/sh
+
 ### BEGIN INIT INFO
 # Provides:          sasc-ng
-# Required-Start:
-# Required-Stop:
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: sasc-ng initscript
-# Description:       sasc-ng init script to start the sasc-ng daemon
-#
+# Short-Description: sasc-ng DVB decryption loopback device
 ### END INIT INFO
 
 # Author: Hein Rigolo <rigolo@gmail.com>
@@ -19,30 +18,14 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="sasc-ng"
 NAME=sasc-ng
-DAEMON=/usr/local/bin/$NAME
-PIDFILE=/var/run/$NAME.pid
-LOGFILE=/var/log/$NAME.log
-DEBUG_MASK=0
-#DEBUG_MASK=0xffffffcf
-
-NUM_LOOPBACK_ADAPTERS=3
-DAEMON_JOIN_ARGS="--join 0:3 --join 1:4 --join 2:5"
-#NUM_LOOPBACK_ADAPTERS=3
-#DAEMON_JOIN_ARGS="--join 0:3"
-ADDITIONAL_DVBLOOPBACK_PARAMS="adapter_nr=3"
-
-#DAEMON_ARGS="--join 0:3 --join 1:4 --join 2:5 --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --daemon --pidfile $PIDFILE --log $LOGFILE"
-#DAEMON_ARGS="--join 0:1 --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --daemon --pidfile $PIDFILE --log $LOGFILE"
-#DAEMON_ARGS="--join 0:2 --join 1:3 --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --sid-experimental --daemon --pidfile $PIDFILE --debug 0 --log $LOGFILE"
-#DAEMON_ARGS="--join 0:3 --join 1:4 --join 2:5 --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --sid-experimental --daemon --pidfile $PIDFILE --debug 0 --log $LOGFILE"
-#DAEMON_ARGS="$DAEMON_JOIN_ARGS --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --sid-experimental --daemon --pidfile $PIDFILE --debug $DEBUG_MASK --log $LOGFILE"
-DAEMON_ARGS="$DAEMON_JOIN_ARGS --cam-budget --cam-dir /etc/sasc-ng --sid-filt 12 --sid-allpid --sid-nocache --buffer 8M --sid-experimental --daemon --pidfile $PIDFILE --debug $DEBUG_MASK"
-SCRIPTNAME=/etc/init.d/$NAME
-INIT_VERBOSE=yes
+DAEMON=/usr/sbin/$NAME
+SCRIPTNAME=/etc/init.d/sasc-ng-common
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
+# TODO: check for proper kernel version
+
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
@@ -69,7 +52,6 @@ do_start()
         start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON --test  \
                 || return 1
         logrotate -f /etc/logrotate.d/sasc-ng
-       ulimit -c unlimited
         start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
                 $DAEMON_ARGS >> $LOGFILE 2>&1 \
                 || return 2

diff --git a/debian/sasc-ng.install.in b/debian/sasc-ng.install.in
index 290958d698df55b54121aeacf948230e9df68dc9..9c3093598e0fcc55754cccf578addcf31beab913 100644 (file)
--- a/debian/sasc-ng.install.in
+++ b/debian/sasc-ng.install.in
@@ -1,3 +1,3 @@
-debian/tmp/#KERNEL#-#FLAVOR#/bin/* /usr/bin/
+debian/tmp/#KERNEL#-#FLAVOR#/bin/* /usr/sbin/
 debian/tmp/#KERNEL#-#FLAVOR#/modules/* /lib/modules/#KERNEL#/misc
 debian/tmp/#KERNEL#-#FLAVOR#/lib/* /usr/lib/