From eb1868500a2213dbd8b0bf6cf925d7195d68dccb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Thu, 21 Dec 2006 20:24:05 +0000 Subject: [PATCH] * make init script sarge aware. --- webcit/debian/webcit.init | 75 +++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 19 deletions(-) diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init index 25a54b42b..c963a30c8 100644 --- a/webcit/debian/webcit.init +++ b/webcit/debian/webcit.init @@ -31,18 +31,31 @@ SENDCOMMAND=/usr/sbin/sendcommand DEFAULT=/etc/default/webcit LOGDIR=/var/log/webcit/ + +unset LANG +unset LANGUAGE +unset LC_ALL +unset LOCALE # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 # Read configuration variable file if it is present [ -r /etc/default/$NAME ] && . /etc/default/$NAME +MODERN= + # Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh +if test -f /lib/init/vars.sh ; then + . /lib/init/vars.sh + MODERN=1 +fi # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions +if test -f /lib/lsb/init-functions; then + . /lib/lsb/init-functions + MODERN=1 +fi if test -f $DEFAULT; then . $DEFAULT @@ -99,8 +112,10 @@ do_stop() # 2 if daemon could not be stopped # other if a failure occurred - kill `cat $PIDFILE.*` - rm -f $PIDFILE.* + for i in $PIDFILE.*; do + kill `cat $i` + rm -f $i + done #while test -d /proc/`cat $PIDFILE`; do # /usr/bin/printf '.' @@ -139,21 +154,35 @@ do_reload() { case "$1" in start) + if test -n "$MODERN"; then [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + else + echo "Starting $DESC" "$NAME" + fi + do_start $WEBCIT_HTTP_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT do_start $WEBCIT_HTTPS_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT -s - case "$?" in + + if test -n "$MODERN"; then + case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac + esac + fi ;; stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + if test -n "$MODERN"; then + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + else + echo "Stopping $DESC" "$NAME" + fi do_stop - case "$?" in + if test -n "$MODERN"; then + case "$?" in 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac + esac + fi ;; #reload|force-reload) # @@ -169,22 +198,30 @@ case "$1" in # If the "reload" option is implemented then remove the # 'force-reload' alias # + if test -n "$MODERN"; then log_daemon_msg "Restarting $DESC" "$NAME" + else + echo "Restarting $DESC" "$NAME" + fi + do_stop - case "$?" in - 0|1) - do_start - case "$?" in + + if test -n "$MODERN"; then + 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 - ;; - *) + esac + ;; + *) # Failed to stop - log_end_msg 1 - ;; - esac + log_end_msg 1 + ;; + esac + fi ;; *) #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 -- 2.30.2