diff options
| author | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-08-15 20:47:17 +0000 |
|---|---|---|
| committer | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-08-15 20:47:17 +0000 |
| commit | f4fdb2b8ffb97d480bb38bdf3c7da42f8c7a5927 (patch) | |
| tree | cacdfab0066e88b0f887d721b5c45aa6dcd55b21 /pki | |
| parent | bf5966f61080faf9bec722aee9246a006735b071 (diff) | |
| download | pki-f4fdb2b8ffb97d480bb38bdf3c7da42f8c7a5927.tar.gz pki-f4fdb2b8ffb97d480bb38bdf3c7da42f8c7a5927.tar.xz pki-f4fdb2b8ffb97d480bb38bdf3c7da42f8c7a5927.zip | |
Resolves #700522 - pki tomcat6 instances currently running unconfined, allow server to come up when selinux disabled
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2146 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
| -rw-r--r-- | pki/base/common/scripts/functions | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pki/base/common/scripts/functions b/pki/base/common/scripts/functions index 2ae93c520..871a57b54 100644 --- a/pki/base/common/scripts/functions +++ b/pki/base/common/scripts/functions @@ -693,8 +693,13 @@ start_instance() # Invoke the initscript for this instance case $PKI_SUBSYSTEM_TYPE in ca|kra|ocsp|tks) - /usr/bin/runcon -t pki_${PKI_SUBSYSTEM_TYPE}_script_t $PKI_INSTANCE_INITSCRIPT start - rv=$? + if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then + /usr/bin/runcon -t pki_${PKI_SUBSYSTEM_TYPE}_script_t \ + $PKI_INSTANCE_INITSCRIPT start + rv=$? + else + $PKI_INSTANCE_INITSCRIPT start + fi ;; ra|tps) $PKI_INSTANCE_INITSCRIPT start |