* added patches from Fathi boudra

[citadel.git] / citadel / debian / citadel.init

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index 3c766c51a5254ccae215824f9f1390187d1e6e31..b657501321f45fa717a2467bbd8ddee81ada9ed1 100644 (file)
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -23,8 +23,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Citadel Groupware "
 NAME=citserver
 DAEMON=/usr/sbin/$NAME
-CTDLSVC=/usr/lib/citadel-server/ctdlsvc
-DAEMON_ARGS=" -x3 -lmail -t/dev/null"
+DAEMON_ARGS=" -d -x3 -lmail -t/dev/null"
 PIDFILE=$RUNDIR/$NAME.pid
 SCRIPTNAME=/etc/init.d/citadel
 SENDCOMMAND=/usr/sbin/sendcommand
@@ -63,7 +62,7 @@ do_start()
        #   0 if daemon has been started
        #   1 if daemon was already running
        #   2 if daemon could not be started
-       if $CTDLSVC $PIDFILE $DAEMON \
+       if $DAEMON \
                $DAEMON_ARGS ; then
            return 0
        else
@@ -199,6 +198,8 @@ case "$1" in
                    log_end_msg 1
                    ;;
            esac
+       else
+           do_start
        fi
        ;;
   *)