summaryrefslogtreecommitdiffstats
path: root/debian/buildsys
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2008-08-23 13:39:47 +0000
committerSol Jerome <solj@ices.utexas.edu>2008-08-23 13:39:47 +0000
commit7df867fb21c01d341a8baca09b328521524a71ca (patch)
tree94483121d07d2488ae99338694e3d6f7b010ec61 /debian/buildsys
parent8ac787d2f018e6e69e9b15933656a62a99db55d9 (diff)
downloadbcfg2-7df867fb21c01d341a8baca09b328521524a71ca.tar.gz
bcfg2-7df867fb21c01d341a8baca09b328521524a71ca.tar.bz2
bcfg2-7df867fb21c01d341a8baca09b328521524a71ca.zip
Fix init scripts for lsb-base update
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4891 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'debian/buildsys')
-rw-r--r--debian/buildsys/common/bcfg2-server.init10
-rw-r--r--debian/buildsys/common/bcfg2.init6
2 files changed, 8 insertions, 8 deletions
diff --git a/debian/buildsys/common/bcfg2-server.init b/debian/buildsys/common/bcfg2-server.init
index 40475bec5..1302ec10c 100644
--- a/debian/buildsys/common/bcfg2-server.init
+++ b/debian/buildsys/common/bcfg2-server.init
@@ -35,17 +35,17 @@ start () {
STATUS=$?
if [ "$STATUS" = 0 ]
then
- log_success_msg "bcfg2-server"
+ 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
}
stop () {
echo -n "Stopping Configuration Management Server: "
- killproc ${BINARY}
+ killproc -p $PIDFILE ${BINARY}
STATUS=$?
if [ "$STATUS" = 0 ]; then
log_success_msg "bcfg2-server"
@@ -66,8 +66,8 @@ status () {
if [ -f $PIDFILE ]; then
if [ -n "$PID" ]; then
- log_failure_msg "$BINARY dead but pid file exists..."
- return 1
+ log_failure_msg "$BINARY dead but pid file exists..."
+ return 1
fi
fi
diff --git a/debian/buildsys/common/bcfg2.init b/debian/buildsys/common/bcfg2.init
index 3f3f35f29..e320f6609 100644
--- a/debian/buildsys/common/bcfg2.init
+++ b/debian/buildsys/common/bcfg2.init
@@ -85,8 +85,8 @@ status () {
fi
if [ -f $PIDFILE ]; then
if [ -n "$PID" ]; then
- log_failure_msg "$BINARY dead but pid file exists..."
- return 1
+ log_failure_msg "$BINARY dead but pid file exists..."
+ return 1
fi
fi
else
@@ -98,7 +98,7 @@ stop () {
if [ "$BCFG2_AGENT" -eq 1 ]
then
echo -n "Stopping configuration management client daemon: "
- killproc ${BINARY}
+ killproc -p $PIDFILE ${BINARY}
STATUS=$?
if [ "$STATUS" -eq 0 ]
then