Use Conflicts: instead of Breaks: as indicated by lintian

[osspd.git] / debian / osspd.init

diff --git a/debian/osspd.init b/debian/osspd.init
index 4b60b8e8004c38b0583e15f2e2620809c19e5757..c95885a58b216c308557a7e003ac0e78ae7af702 100644 (file)
--- a/debian/osspd.init
+++ b/debian/osspd.init
@@ -14,24 +14,17 @@
 # Author: Ralf Jung <post@ralfj.de>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 # Author: Ralf Jung <post@ralfj.de>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin

-DESC=" OSS Proxy Daemon"
+DESC="OSS Proxy Daemon"

 NAME=osspd
 DAEMON=/usr/sbin/$NAME
 NAME=osspd
 DAEMON=/usr/sbin/$NAME

+DAEMON_ARGS="-f" # run in foreground, start-stop-daemon does the forking: required to let start-stop-daemon handle the pidfile

 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # 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
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-

 # Define LSB log_* functions.
 # Define LSB log_* functions.

-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.

 . /lib/lsb/init-functions
 
 #
 . /lib/lsb/init-functions
 
 #


@@ -44,9 +37,10 @@ do_start()
        #   0 if daemon has been started
        #   1 if daemon was already running
        #   2 if daemon could not be started
        #   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 \
+       start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON --test > /dev/null \

                || return 1
                || return 1

-       start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+       start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON -- -f \
+               $DAEMON_ARGS \

                || return 2
 }
 
                || return 2
 }
 


@@ -66,19 +60,19 @@ do_stop()
 
 case "$1" in
   start)
 
 case "$1" in
   start)

-       [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+       log_daemon_msg "Starting $DESC" "$NAME"

        do_start
        case "$?" in
        do_start
        case "$?" in

-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+               0|1) log_end_msg 0 ;;
+               2) log_end_msg 1 ;;

        esac
        ;;
   stop)
        esac
        ;;
   stop)

-       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+       log_daemon_msg "Stopping $DESC" "$NAME"

        do_stop
        case "$?" in
        do_stop
        case "$?" in

-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+               0|1) log_end_msg 0 ;;
+               2) log_end_msg 1 ;;

        esac
        ;;
   status)
        esac
        ;;
   status)