diff options
author | Ade Lee <alee@redhat.com> | 2012-12-18 14:25:13 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-12-19 00:05:38 -0500 |
commit | c3fdb8ffc11938514d96760c9a62d619f90cbcca (patch) | |
tree | 7266ac55f7a8d0dbe1eec283693fb2a4f033b86e /base/deploy/src/scriptlets/selinux_setup.py | |
parent | 33edf556a456ef329cb1eae1b539b8fdd3a50b22 (diff) | |
download | pki-c3fdb8ffc11938514d96760c9a62d619f90cbcca.tar.gz pki-c3fdb8ffc11938514d96760c9a62d619f90cbcca.tar.xz pki-c3fdb8ffc11938514d96760c9a62d619f90cbcca.zip |
pkispawn modified to not relabel when selinux is disabled
Ticket 393
Diffstat (limited to 'base/deploy/src/scriptlets/selinux_setup.py')
-rw-r--r-- | base/deploy/src/scriptlets/selinux_setup.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/base/deploy/src/scriptlets/selinux_setup.py b/base/deploy/src/scriptlets/selinux_setup.py index 87e129f75..f3b7d1273 100644 --- a/base/deploy/src/scriptlets/selinux_setup.py +++ b/base/deploy/src/scriptlets/selinux_setup.py @@ -26,8 +26,10 @@ from pkiconfig import pki_selinux_config_ports as ports import pkihelper as util import pkimessages as log import pkiscriptlet -import seobject import selinux +if selinux.is_selinux_enabled(): + import seobject + # PKI Deployment Selinux Setup Scriptlet class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): @@ -45,6 +47,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.SKIP_SELINUX_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) return self.rv + + if not bool(selinux.is_selinux_enabled()): + config.pki_log.info(log.SELINUX_DISABLED_SPAWN_1, __name__, + extra=config.PKI_INDENTATION_LEVEL_1) + return self.rv + config.pki_log.info(log.SELINUX_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) @@ -109,6 +117,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): return self.rv def destroy(self): + if not bool(selinux.is_selinux_enabled()): + config.pki_log.info(log.SELINUX_DISABLED_DESTROY_1, __name__, + extra=config.PKI_INDENTATION_LEVEL_1) + return self.rv config.pki_log.info(log.SELINUX_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) |