diff options
| author | Gordon Messmer <gordon@dragonsdawn.net> | 2015-11-19 10:59:03 -0800 |
|---|---|---|
| committer | Gordon Messmer <gordon@dragonsdawn.net> | 2015-11-19 10:59:03 -0800 |
| commit | f3291a1a4e41ff6e9fc188aa7f9864e00967c490 (patch) | |
| tree | 8829c0b51a1407199a72ca39709b1a33d51ace5d /src/lib/Bcfg2/Client/Tools | |
| parent | 815259a57104f23d98f705b7c82c7581adc2ff7e (diff) | |
| download | bcfg2-f3291a1a4e41ff6e9fc188aa7f9864e00967c490.tar.gz bcfg2-f3291a1a4e41ff6e9fc188aa7f9864e00967c490.tar.bz2 bcfg2-f3291a1a4e41ff6e9fc188aa7f9864e00967c490.zip | |
Fix SELinux option parsing.
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/__init__.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/base.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py index c27c7559d..41bff751d 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/__init__.py @@ -14,7 +14,7 @@ from Bcfg2.Client.Tools.POSIX.base import POSIXTool class POSIX(Bcfg2.Client.Tools.Tool): """POSIX File support code.""" - options = Bcfg2.Client.Tools.Tool.options + [ + options = Bcfg2.Client.Tools.Tool.options + POSIXTool.options + [ Bcfg2.Options.PathOption( cf=('paranoid', 'path'), default='/var/cache/bcfg2', dest='paranoid_path', diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/base.py b/src/lib/Bcfg2/Client/Tools/POSIX/base.py index 488920989..b1e754408 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/base.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/base.py @@ -303,7 +303,7 @@ class POSIXTool(Bcfg2.Client.Tools.Tool): # no context listed return True secontext = selinux.lgetfilecon(path)[1].split(":")[2] - if secontext in Bcfg2.Options.setup.posix_secontext_ignore: + if secontext in Bcfg2.Options.setup.secontext_ignore: return True try: if context == '__default__': |