diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-01-20 10:45:21 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-01-20 10:45:21 -0600 |
| commit | b3254347f4815d8534d0cc629bd08aadb1cad034 (patch) | |
| tree | 5923e98ef4aeebc2f0002f42fa8267cf5c7f604d /src | |
| parent | 2d2a3905ca48622e0e974176e0a5bbd739c7c8fa (diff) | |
| parent | 09da95213441569103749a2759cc7ed445edc66d (diff) | |
| download | bcfg2-b3254347f4815d8534d0cc629bd08aadb1cad034.tar.gz bcfg2-b3254347f4815d8534d0cc629bd08aadb1cad034.tar.bz2 bcfg2-b3254347f4815d8534d0cc629bd08aadb1cad034.zip | |
Merge branch 'tests-secontext' of https://github.com/gordonmessmer/bcfg2
Diffstat (limited to 'src')
| -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__': |