diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2009-10-14 22:45:45 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2009-10-14 22:45:45 +0000 |
| commit | 3f4cfa355f9f3c20a1c9dd13bd224416995be100 (patch) | |
| tree | 491a5a2661e0a4736d669144a1762c80e2f55ac5 /src/lib | |
| parent | 929574f22d8a92383b146f8a992c1707da895632 (diff) | |
| download | bcfg2-3f4cfa355f9f3c20a1c9dd13bd224416995be100.tar.gz bcfg2-3f4cfa355f9f3c20a1c9dd13bd224416995be100.tar.bz2 bcfg2-3f4cfa355f9f3c20a1c9dd13bd224416995be100.zip | |
Add bcfg2.conf option so that client can always run in paranoid mode
You currently must specify the -P command line option in order to run
the client in paranoid mode. In order to allow for consistent usage (as
specified in ticket #763), this commit adds an option to bcfg2.conf so
that the client will always be run in paranoid mode.
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5482 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Client/Tools/POSIX.py | 5 | ||||
| -rw-r--r-- | src/lib/Options.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 917dc6620..8127d29fe 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -611,8 +611,9 @@ class POSIX(Bcfg2.Client.Tools.Tool): return False # If we get here, then the parent directory should exist - if entry.get("paranoid", False) and self.setup.get("paranoid", False) \ - and not (entry.get('current_exists', 'true') == 'false'): + if (entry.get("paranoid", False) == 'true') and \ + self.setup.get("paranoid", False) and not \ + (entry.get('current_exists', 'true') == 'false'): bkupnam = entry.get('name').replace('/', '_') # current list of backups for this ConfigFile bkuplist = [f for f in os.listdir(self.ppath) if diff --git a/src/lib/Options.py b/src/lib/Options.py index 1e4ce7aef..a983e8827 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -253,7 +253,7 @@ CLIENT_DRYRUN = Option('do not actually change the system', CLIENT_EXTRA_DISPLAY = Option('enable extra entry output', default=False, cmd='-e', ) CLIENT_PARANOID = Option('make automatic backups of config files', - default=False, cmd='-P', ) + default=False, cmd='-P', cf=('client', 'paranoid')) CORE_PROFILE = Option('profile', default=False, cmd='-p', ) CLIENT_DRIVERS = Option('Specify tool driver set', cmd='-D', |