diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-04-19 18:44:59 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-04-26 14:01:42 +0200 |
| commit | 30f3d198d0dcac32deb1c129a1bf406e70b57774 (patch) | |
| tree | 4d351afb135a3e51f54e046eeb5efb7a58250586 /ipaplatform | |
| parent | c5686295f14c955d34d9598ddb80b30cb9df663c (diff) | |
| download | freeipa-30f3d198d0dcac32deb1c129a1bf406e70b57774.tar.gz freeipa-30f3d198d0dcac32deb1c129a1bf406e70b57774.tar.xz freeipa-30f3d198d0dcac32deb1c129a1bf406e70b57774.zip | |
Remove deprecated hostname restoration from Fedora18
This is not needed on new Fedora, because restore will not be effective.
https://fedorahosted.org/freeipa/ticket/5794
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/paths.py | 2 | ||||
| -rw-r--r-- | ipaplatform/redhat/tasks.py | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 62d9e703d..ca7eb6cf4 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -118,8 +118,6 @@ class BasePathNamespace(object): SYSCONFIG_HTTPD = "/etc/sysconfig/httpd" SYSCONFIG_KRB5KDC_DIR = "/etc/sysconfig/krb5kdc" SYSCONFIG_NAMED = "/etc/sysconfig/named" - SYSCONFIG_NETWORK = "/etc/sysconfig/network" - SYSCONFIG_NETWORK_IPABKP = "/etc/sysconfig/network.ipabkp" SYSCONFIG_NFS = "/etc/sysconfig/nfs" SYSCONFIG_NTPD = "/etc/sysconfig/ntpd" SYSCONFIG_ODS = "/etc/sysconfig/ods" diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index 2a110c994..bc7a9e389 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -343,7 +343,6 @@ class RedHatTaskNamespace(BaseTaskNamespace): statestore.backup_state('network', 'hostname', old_hostname) def restore_hostname(self, fstore, statestore): - old_filepath = paths.SYSCONFIG_NETWORK old_hostname = statestore.get_state('network', 'hostname') if old_hostname is not None: @@ -356,15 +355,6 @@ class RedHatTaskNamespace(BaseTaskNamespace): old_hostname, e ) - if fstore.has_file(old_filepath): - # This is Fedora >=18 instance that was upgraded from previous - # Fedora version which held network configuration - # in /etc/sysconfig/network - old_filepath_restore = paths.SYSCONFIG_NETWORK_IPABKP - fstore.restore_file(old_filepath, old_filepath_restore) - print("Deprecated configuration file '%s' was restored to '%s'" \ - % (old_filepath, old_filepath_restore)) - filepath = paths.ETC_HOSTNAME if fstore.has_file(filepath): fstore.restore_file(filepath) |