init scripts: Don't error out when stopping in restart action

[hcoop/domtool2.git] / scripts / domtool-server

diff --git a/scripts/domtool-server b/scripts/domtool-server
index 6ad1be6..da7282a 100755 (executable)
--- a/scripts/domtool-server
+++ b/scripts/domtool-server
@@ -16,7 +16,7 @@ case $1 in
                start-stop-daemon --start --pidfile $PIDFILE \
                        -c domtool:domtool \
                        --exec /usr/bin/k5start -- -U -b \
                start-stop-daemon --start --pidfile $PIDFILE \
                        -c domtool:domtool \
                        --exec /usr/bin/k5start -- -U -b \

-                       -f /etc/keytabs/domtool.`hostname` \
+                       -f /etc/keytabs/domtool \

                        -K 300 -t -p $PIDFILE \
                        domtool-server-logged
                echo "."
                        -K 300 -t -p $PIDFILE \
                        domtool-server-logged
                echo "."


@@ -35,7 +35,7 @@ case $1 in
        ;;
 
   restart|reload|force-reload)
        ;;
 
   restart|reload|force-reload)

-       $SELF stop
+       set +e; $SELF stop; set -e

        $SELF start
        ;;
 
        $SELF start
        ;;