summaryrefslogtreecommitdiffstats
path: root/debian/buildsys
diff options
context:
space:
mode:
authorJoey Hagedorn <hagedorn@mcs.anl.gov>2007-07-25 17:59:31 +0000
committerJoey Hagedorn <hagedorn@mcs.anl.gov>2007-07-25 17:59:31 +0000
commit2a341dae60dbcff215078b3deb73a3ae9f609218 (patch)
treeeb9e7cd13d7d7eb6a2f670e7f56952c508f33a6a /debian/buildsys
parenta464344029d9438db0fa419ee386a43184f4e818 (diff)
downloadbcfg2-2a341dae60dbcff215078b3deb73a3ae9f609218.tar.gz
bcfg2-2a341dae60dbcff215078b3deb73a3ae9f609218.tar.bz2
bcfg2-2a341dae60dbcff215078b3deb73a3ae9f609218.zip
fixed problem with updated init script for agent mode
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3564 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'debian/buildsys')
-rw-r--r--debian/buildsys/common/bcfg2.init7
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/buildsys/common/bcfg2.init b/debian/buildsys/common/bcfg2.init
index a082e17e5..a1a857194 100644
--- a/debian/buildsys/common/bcfg2.init
+++ b/debian/buildsys/common/bcfg2.init
@@ -23,6 +23,7 @@ BCFG2=/usr/sbin/bcfg2
# Set default options
# You can set script specific options with BCFG2_OPTIONS_INIT
+# You can set agent-mode specific options with BCFG2_OPTIONS_AGENT
BCFG2_OPTIONS="-q"
# Disabled per default
@@ -33,13 +34,13 @@ BCFG2_AGENT=0
# Include default startup configuration if exists
test -f "/etc/default/bcfg2" && . /etc/default/bcfg2
-[ "$BCFG2_ENABLED" -eq "0" -o "$BCFG2_INIT" -eq 0 ] && exit 0
+[ "$BCFG2_ENABLED" -eq "0"] && exit 0
+[ "$BCFG2_AGENT" -eq "0" -a "$BCFG2_INIT" -eq 0 ] && exit 0
# Exit if bcfg2 doesn't exist and is not executable
test -x $BCFG2 || exit 5
# Agent mode daemon capability
-DAEMON_PARAMS="-A"
PIDFILE=/var/run/bcfg2.pid
# Internal variables
BINARY=$(basename $BCFG2)
@@ -51,7 +52,7 @@ case "$1" in
start)
echo -n "Running configuration management client: "
if ["$BCFG2_AGENT" = 1]
- start_daemon ${BCFG2} ${DAEMON_PARAMS} ${BCFG2_OPTIONS} ${BCFG2_OPTIONS_INIT}
+ start_daemon ${BCFG2} -A ${BCFG2_OPTIONS} ${BCFG2_OPTIONS_AGENT}
STATUS=$?
else
${BCFG2} ${BCFG2_OPTIONS} ${BCFG2_OPTIONS_INIT}