diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-08-15 09:23:58 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-08-15 09:23:58 -0500 |
| commit | 8738109a1491af68f753d851938b79b467291e39 (patch) | |
| tree | 1f37dc66602b4c2759002005b806347872131c5e /debian | |
| parent | a516f116501737a86e2eaf99a631727d4be9ecd7 (diff) | |
| download | bcfg2-8738109a1491af68f753d851938b79b467291e39.tar.gz bcfg2-8738109a1491af68f753d851938b79b467291e39.tar.bz2 bcfg2-8738109a1491af68f753d851938b79b467291e39.zip | |
debian: Clean up PID file
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/bcfg2-server.init | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init index b1c3aba21..cd2ad858e 100755 --- a/debian/bcfg2-server.init +++ b/debian/bcfg2-server.init @@ -33,8 +33,8 @@ BCFG2_SERVER_ENABLED=0 test -f "/etc/default/bcfg2-server" && . /etc/default/bcfg2-server if [ "$BCFG2_SERVER_ENABLED" -eq 0 ] ; then - log_failure_msg "bcfg2-server is disabled - see /etc/default/bcfg2-server" - exit 0 + log_failure_msg "bcfg2-server is disabled - see /etc/default/bcfg2-server" + exit 0 fi # Exit if $DAEMON doesn't exist and is not executable @@ -63,10 +63,11 @@ stop () { killproc -p $PIDFILE ${BINARY} STATUS=$? if [ "$STATUS" = 0 ]; then - log_success_msg "bcfg2-server" - test -d /var/lock/subsys && touch /var/lock/subsys/bcfg2-server + [ -e $PIDFILE ] && rm -f $PIDFILE + log_success_msg "bcfg2-server" + test -d /var/lock/subsys && touch /var/lock/subsys/bcfg2-server else - log_failure_msg "bcfg2-server" + log_failure_msg "bcfg2-server" fi return $STATUS } @@ -75,15 +76,15 @@ status () { # Inspired by redhat /etc/init.d/functions status() call PID=$(pidof -x $BINARY -o %PPID) if [ -n "$PID" ]; then - echo "$BINARY (pid $PID) is running..." - return 0 + echo "$BINARY (pid $PID) is running..." + return 0 fi if [ -f $PIDFILE ]; then - if [ -n "$PID" ]; then - log_failure_msg "$BINARY dead but pid file exists..." - return 1 - fi + if [ -n "$PID" ]; then + log_failure_msg "$BINARY dead but pid file exists..." + return 1 + fi fi log_failure_msg "$BINARY is not running" |