From: Jan-Pascal van Best Date: Fri, 25 Jan 2013 21:29:55 +0000 (+0100) Subject: Use sasc-ng name for init and default scripts X-Git-Tag: debian/620-3~5 X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=57032c1799b317bdac7d91005d0ffe5931816ca8;p=sasc-ng.git Use sasc-ng name for init and default scripts --- diff --git a/debian/changelog b/debian/changelog index 0f75380..faada35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sasc-ng (620-2) local; urgency=low + + * Fix for wrongly named init script + + -- Jan-Pascal van Best Fri, 25 Jan 2013 22:39:40 +0100 + sasc-ng (620-1) local; urgency=low * Initial release. (Closes: #XXXXXX) diff --git a/debian/rules b/debian/rules index 184d897..9b2ac9a 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,9 @@ SHELL := /bin/bash $(MAKE) -f debian/rules debian/control; \ fi +override_dh_installinit: + dh_installinit --name sasc-ng + override_dh_auto_configure: # done per binary package in build-% rule diff --git a/debian/sasc-ng-common.default b/debian/sasc-ng-common.default deleted file mode 100755 index 648f1a3..0000000 --- a/debian/sasc-ng-common.default +++ /dev/null @@ -1,15 +0,0 @@ -# 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 deleted file mode 100755 index cbfa0bb..0000000 --- a/debian/sasc-ng-common.init +++ /dev/null @@ -1,156 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: sasc-ng -# 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 DVB decryption loopback device -### END INIT INFO - -# Author: Hein Rigolo -# - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="sasc-ng" -NAME=sasc-ng -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 - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - modprobe dvbloopback num_adapters=$NUM_LOOPBACK_ADAPTERS $ADDITIONAL_DVBLOOPBACK_PARAMS - - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - #start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - # || return 1 - start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON --test \ - || return 1 - logrotate -f /etc/logrotate.d/sasc-ng - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS >> $LOGFILE 2>&1 \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac - diff --git a/debian/sasc-ng-common.sasc-ng.default b/debian/sasc-ng-common.sasc-ng.default new file mode 100755 index 0000000..648f1a3 --- /dev/null +++ b/debian/sasc-ng-common.sasc-ng.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.sasc-ng.init b/debian/sasc-ng-common.sasc-ng.init new file mode 100755 index 0000000..cbfa0bb --- /dev/null +++ b/debian/sasc-ng-common.sasc-ng.init @@ -0,0 +1,156 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: sasc-ng +# 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 DVB decryption loopback device +### END INIT INFO + +# Author: Hein Rigolo +# + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="sasc-ng" +NAME=sasc-ng +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 + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + modprobe dvbloopback num_adapters=$NUM_LOOPBACK_ADAPTERS $ADDITIONAL_DVBLOOPBACK_PARAMS + + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + #start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + # || return 1 + start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON --test \ + || return 1 + logrotate -f /etc/logrotate.d/sasc-ng + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS >> $LOGFILE 2>&1 \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac +