diff options
| author | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-09-12 16:19:31 +0200 |
|---|---|---|
| committer | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-09-12 16:19:31 +0200 |
| commit | d9341a570b76393034c292b16273e528bd41d0e1 (patch) | |
| tree | 3db2e5afe6c8c2fe9817787abbf60e8fdaaebd04 /man | |
| parent | 29b4eaa020d07afa845df32b4c8b6f4ecc15ba89 (diff) | |
| download | bcfg2-d9341a570b76393034c292b16273e528bd41d0e1.tar.gz bcfg2-d9341a570b76393034c292b16273e528bd41d0e1.tar.bz2 bcfg2-d9341a570b76393034c292b16273e528bd41d0e1.zip | |
Clarify that "bcfg2 -f [...]" ignores "-l"
Document the fact that the client will ignore any decision list
specified via "-l" (or in the bcfg2.conf(5) file) if the client is
called with the "-f" option (which tells it to configure from a file).
Diffstat (limited to 'man')
| -rw-r--r-- | man/bcfg2.1 | 3 | ||||
| -rw-r--r-- | man/bcfg2.conf.5 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1 index 0ace97e8a..661153a15 100644 --- a/man/bcfg2.1 +++ b/man/bcfg2.1 @@ -98,7 +98,8 @@ 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 -administrators and much configuration variety. +administrators and much configuration variety. (This setting will be +ignored if the -f option is also specified.) .TP .BR "\-n" diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index def850b67..ba091d8b1 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -296,7 +296,8 @@ These options only affect client functionality, specified in the .TP .B decision -Specify the server decision list mode (whitelist or blacklist). +Specify the server decision list mode (whitelist or blacklist). (This +setting will be ignored if the client is called with the -f option.) .TP .B drivers |