diff options
Diffstat (limited to 'debian/buildsys/common')
-rw-r--r-- | debian/buildsys/common/bcfg2-server.init | 19 | ||||
-rw-r--r-- | debian/buildsys/common/bcfg2.init | 11 |
2 files changed, 14 insertions, 16 deletions
diff --git a/debian/buildsys/common/bcfg2-server.init b/debian/buildsys/common/bcfg2-server.init index 5a51056f2..512c80637 100644 --- a/debian/buildsys/common/bcfg2-server.init +++ b/debian/buildsys/common/bcfg2-server.init @@ -26,6 +26,9 @@ test -x $DAEMON || exit 5 # Include lsb functions . /lib/lsb/init-functions +msg=log_success_msg +fail=log_failure_msg + # Internal variables BINARY=$(basename $DAEMON) @@ -36,9 +39,9 @@ case "$1" in STATUS=$? if [ "$STATUS" = 0 ] then - log_success_msg "bcfg2-server" + ${msg} "bcfg2-server" else - log_failure_msg "bcfg2-server" + ${fail} "bcfg2-server" fi exit $STATUS ;; @@ -47,14 +50,14 @@ case "$1" in killproc ${BINARY} STATUS=$? if [ "$STATUS" = 0 ]; then - log_success_msg "bcfg2-server" + ${msg} "bcfg2-server" exit 0 else - log_failure_msg "bcfg2-server" + ${fail} "bcfg2-server" fi exit $STATUS ;; - force-reload|restart) + restart|force-reload|reload) $0 stop sleep 5 $0 start @@ -69,16 +72,16 @@ case "$1" in if [ -f $PIDFILE ]; then if [ -n "$PID" ]; then - echo "$BINARY dead but pid file exists..." + ${fail} "$BINARY dead but pid file exists..." exit 1 fi fi - echo "$BINARY is not running" + ${fail} "$BINARY is not running" exit 3 ;; *) - log_success_msg "Usage: bcfg2-server {start|stop|restart|force-reload}" + ${msg} "Usage: $0 {start|stop|status|reload|restart|force-reload}" exit 1 ;; esac diff --git a/debian/buildsys/common/bcfg2.init b/debian/buildsys/common/bcfg2.init index 8476c3718..ca6262afc 100644 --- a/debian/buildsys/common/bcfg2.init +++ b/debian/buildsys/common/bcfg2.init @@ -1,5 +1,4 @@ #!/bin/sh -# Start bcfg2 client on startup # # bcfg2 - bcfg2 configuration client # @@ -9,7 +8,7 @@ ### BEGIN INIT INFO # Provides: bcfg2 # Required-Start: $network $named -# Required-Stop: +# Required-Stop: # Default-Start: 2 3 4 5 # Default-Stop: S 0 1 6 # Short-Description: Configuration management client @@ -54,19 +53,15 @@ case "$1" in fi exit $STATUS ;; - restart) - $0 stop - $0 start - ;; status) # Since we are always OK, always return OK as status exit 0 ;; - stop|force-reload) + restart|reload|stop|force-reload) true ;; *) - echo "Usage: $0 {start|stop|restart|force-reload|status}" + echo "Usage: $0 {start|stop|restart|reload|force-reload|status}" exit 1 esac |