r9565@galaxy: weasel | 2006-08-29 22:20:38 +0200

Do not reload or start when our config is known to be broken


svn:r8298
This commit is contained in:
Peter Palfrader
2006-08-29 20:43:52 +00:00
parent 4fa8abb7da
commit e866702809
+16 -6
View File
@@ -81,12 +81,18 @@ case "$1" in
fi
fi
echo "Starting $DESC: $NAME..."
start-stop-daemon --start --quiet --oknodo \
--chuid debian-tor:debian-tor \
--pidfile $TORPID \
$NICE \
--exec $DAEMON -- $ARGS
echo "done."
if ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then
echo "ABORTED: Tor configuration invalid:" >&2
su -c "$DAEMON --verify-config" debian-tor >&2
exit 1
else
start-stop-daemon --start --quiet --oknodo \
--chuid debian-tor:debian-tor \
--pidfile $TORPID \
$NICE \
--exec $DAEMON -- $ARGS
echo "done."
fi
fi
fi
;;
@@ -117,6 +123,10 @@ case "$1" in
elif test ! -f $TORPID -o -z "$pid"
then
echo "not running (there is no $TORPID)."
elif ! su -c "$DAEMON --verify-config" debian-tor > /dev/null; then
echo "ABORTED: Tor configuration invalid:" >&2
su -c "$DAEMON --verify-config" debian-tor >&2
exit 1
elif start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
then
echo "$NAME."