diff options
author | Tomas Babej <tbabej@redhat.com> | 2014-05-26 17:23:04 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:18 +0200 |
commit | 6a4cd8a4e33fba68c89d6046a98adb790c401041 (patch) | |
tree | 14dbb08aa0ddef32282958bff5dbb61af7ab2058 /ipapython | |
parent | c465eb842f8b6637268ae790b3cee5a88a5e1544 (diff) | |
download | freeipa-6a4cd8a4e33fba68c89d6046a98adb790c401041.tar.gz freeipa-6a4cd8a4e33fba68c89d6046a98adb790c401041.tar.xz freeipa-6a4cd8a4e33fba68c89d6046a98adb790c401041.zip |
ipaplatform: Move restore_context and check_selinux_status implementations to base fedora platform tasks
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r-- | ipapython/platform/redhat/__init__.py | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/ipapython/platform/redhat/__init__.py b/ipapython/platform/redhat/__init__.py index cd7b105bb..fda7ade9c 100644 --- a/ipapython/platform/redhat/__init__.py +++ b/ipapython/platform/redhat/__init__.py @@ -58,28 +58,6 @@ authconfig = RedHatAuthConfig service = redhat_service knownservices = RedHatServices() -def restore_context(filepath, restorecon='/sbin/restorecon'): - """ - restore security context on the file path - SELinux equivalent is /path/to/restorecon <filepath> - - restorecon's return values are not reliable so we have to - ignore them (BZ #739604). - - ipautil.run() will do the logging. - """ - try: - if (os.path.exists('/usr/sbin/selinuxenabled')): - ipautil.run(["/usr/sbin/selinuxenabled"]) - else: - # No selinuxenabled, no SELinux - return - except ipautil.CalledProcessError: - # selinuxenabled returns 1 if not enabled - return - - if (os.path.exists(restorecon)): - ipautil.run([restorecon, filepath], raiseonerr=False) def backup_and_replace_hostname(fstore, statestore, hostname): old_hostname = socket.gethostname() @@ -105,28 +83,6 @@ def backup_and_replace_hostname(fstore, statestore, hostname): else: statestore.backup_state('network', 'hostname', old_hostname) -def check_selinux_status(restorecon='/sbin/restorecon'): - """ - We don't have a specific package requirement for policycoreutils - which provides restorecon. This is because we don't require - SELinux on client installs. However if SELinux is enabled then - this package is required. - - This function returns nothing but may raise a Runtime exception - if SELinux is enabled but restorecon is not available. - """ - try: - if (os.path.exists('/usr/sbin/selinuxenabled')): - ipautil.run(["/usr/sbin/selinuxenabled"]) - else: - # No selinuxenabled, no SELinux - return - except ipautil.CalledProcessError: - # selinuxenabled returns 1 if not enabled - return - - if not os.path.exists(restorecon): - raise RuntimeError('SELinux is enabled but %s does not exist.\nInstall the policycoreutils package and start the installation again.' % restorecon) def restore_network_configuration(fstore, statestore): filepath = '/etc/sysconfig/network' |