summaryrefslogtreecommitdiffstats
path: root/man/bcfg2.1
diff options
context:
space:
mode:
authorHolger Weiß <holger@zedat.fu-berlin.de>2011-06-04 23:52:02 +0200
committerHolger Weiß <holger@zedat.fu-berlin.de>2011-06-04 23:52:02 +0200
commit437f61a1bf60bd884b9bcfd177e60922df596fb2 (patch)
tree9db8d48625dc7fae9d9686b0836e8b3317ed41c7 /man/bcfg2.1
parent77a0d13ab9d9c90048ebea623f1c31cdb225ccf1 (diff)
downloadbcfg2-437f61a1bf60bd884b9bcfd177e60922df596fb2.tar.gz
bcfg2-437f61a1bf60bd884b9bcfd177e60922df596fb2.tar.bz2
bcfg2-437f61a1bf60bd884b9bcfd177e60922df596fb2.zip
Document the "decision" option in bcfg2.conf(5)
Add documentation for the "decision" option to the bcfg2.conf(5) man page. Also, note that it can be overridden using "-l none" on the bcfg2(1) command line.
Diffstat (limited to 'man/bcfg2.1')
-rw-r--r--man/bcfg2.110
1 files changed, 6 insertions, 4 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1
index 7f108ed8f..49fd1e208 100644
--- a/man/bcfg2.1
+++ b/man/bcfg2.1
@@ -85,10 +85,12 @@ debian toolset; it calls apt\-get update and clean and
dpkg \-\-configure \-\-pending.
.TP
-.BR "\-l <whitelist|blacklist>"
-Run the client in the server decision list mode. This approach is needed
-when particular changes are deemed "high risk". It gives the ability to
-centrally specify these changes, but only install them on clients when
+.BR "\-l <whitelist|blacklist|none>"
+Run the client in the server decision list mode (unless "none" is
+specified, which can be done in order to override the decision list mode
+specified in bcfg2.conf). This approach is needed when particular
+changes are deemed "high risk". It gives the ability to centrally
+specify these changes, but only install them on clients when
administrator supervision is available. Because collaborative
configuration is one of the remaining hard issues in configuration
management, these issues typically crop up in environments with several