summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-08-03 15:35:50 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-08-03 15:35:50 +0000
commit902c3519f67eaa7119c02bd78b65bf97f28103be (patch)
tree394d0c589d2471fe5d12ecac0647960165177943 /debian
parent791c0fef838d42b584c87504ba866cafafc74dcb (diff)
downloadbcfg2-902c3519f67eaa7119c02bd78b65bf97f28103be.tar.gz
bcfg2-902c3519f67eaa7119c02bd78b65bf97f28103be.tar.bz2
bcfg2-902c3519f67eaa7119c02bd78b65bf97f28103be.zip
More packaging updates from Ressu
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2038 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'debian')
-rw-r--r--debian/bcfg2.default18
-rw-r--r--debian/buildsys/2.3/bcfg2.init10
-rw-r--r--debian/buildsys/common/bcfg2.init7
3 files changed, 27 insertions, 8 deletions
diff --git a/debian/bcfg2.default b/debian/bcfg2.default
index 0b00f7c35..80dc94cca 100644
--- a/debian/bcfg2.default
+++ b/debian/bcfg2.default
@@ -2,18 +2,26 @@
# BCFG2_OPTIONS:
# Set the default options for Bcfg2 on startup
-#
+# Default: "-q"
#BCFG2_OPTIONS="-q"
-# BCFG_ENABLED:
+# BCFG2_ENABLED:
# Should Bcfg2 be run automatically by system scripts
#
-# Uncomment the following line to automatically start bcfg2 on startup
-#
+# Uncomment the following line to enable any of the below selections
+# Default: 0 (disable)
#BCFG2_ENABLED=1
+# BCFG2_INIT:
+# Enable bcfg2 during system bootup
+#
+# Set value to 1 to enable
+# Default: 0 (disable)
+#BCFG2_INIT=1
+
# BCFG2_CRON:
# Set the frequency of cron runs.
#
-# Can be set to off, hourly or daily
+# Can be set to off, hourly, daily or both
+# Default: off
#BCFG2_CRON=off
diff --git a/debian/buildsys/2.3/bcfg2.init b/debian/buildsys/2.3/bcfg2.init
index a184297e8..e6781208d 100644
--- a/debian/buildsys/2.3/bcfg2.init
+++ b/debian/buildsys/2.3/bcfg2.init
@@ -6,8 +6,16 @@
# description: bcfg2 client for configuration requests
#
BCFG2_OPTIONS="-q"
+
+# Disabled per default
+BCFG2_ENABLED=0
+BCFG2_INIT=0
+
+# Include default startup configuration if exists
test -f "/etc/default/bcfg2" && . /etc/default/bcfg2
+["$BCFG2_ENABLED" == "0" -o "$BCFG2_INIT" == 0 ] && exit 0
+
case "$1" in
start)
if test -e /etc/donttouchme; then
@@ -15,7 +23,7 @@ case "$1" in
echo "bcfg2 does not need to run."
else
echo -n "Running bcfg: "
- /usr/sbin/bcfg2 $BCFG2_OPTIONS
+ /usr/sbin/bcfg2 $BCFG2_OPTIONS $BCFG2_OPTIONS_INIT
echo "bcfg2"
fi
;;
diff --git a/debian/buildsys/common/bcfg2.init b/debian/buildsys/common/bcfg2.init
index e7466f18d..1c2836c7a 100644
--- a/debian/buildsys/common/bcfg2.init
+++ b/debian/buildsys/common/bcfg2.init
@@ -22,15 +22,18 @@
# This might need some better logic
BCFG2=/usr/sbin/bcfg2
+# Set default options
+# You can set script specific options with BCFG2_OPTIONS_INIT
BCFG2_OPTIONS="-q"
# Disabled per default
BCFG2_ENABLED=0
+BCFG2_INIT=0
# Include default startup configuration if exists
test -f "/etc/default/bcfg2" && . /etc/default/bcfg2
-test "$BCFG2_ENABLED" != "0" || exit 0
+["$BCFG2_ENABLED" == "0" -o "$BCFG2_INIT" == 0 ] && exit 0
# Exit if bcfg2 doesn't exist and is not executable
test -x $BCFG2 || exit 5
@@ -41,7 +44,7 @@ test -x $BCFG2 || exit 5
case "$1" in
start)
echo -n "Running configuration management client: "
- ${BCFG2} ${BCFG2_OPTIONS}
+ ${BCFG2} ${BCFG2_OPTIONS} ${BCFG2_OPTIONS_INIT}
STATUS=$?
if [ "$STATUS" = 0 ]
then