mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Change network configuration file
Fedora+systemd changed deprecated /etc/sysconfig/network which was used by IPA to store static hostname for the IPA machine. See https://bugzilla.redhat.com/show_bug.cgi?id=881785 for details. Change Fedora platform files to store the hostname to /etc/hostname instead. https://fedorahosted.org/freeipa/ticket/3279
This commit is contained in:
@@ -497,6 +497,7 @@ def uninstall():
|
||||
krbinstance.KrbInstance(fstore).uninstall()
|
||||
dsinstance.DsInstance(fstore=fstore).uninstall()
|
||||
memcacheinstance.MemcacheInstance().uninstall()
|
||||
ipaservices.restore_network_configuration(fstore, sstore)
|
||||
fstore.restore_all_files()
|
||||
try:
|
||||
os.remove(ANSWER_CACHE)
|
||||
@@ -510,13 +511,7 @@ def uninstall():
|
||||
|
||||
ipaservices.knownservices.ipa.disable()
|
||||
|
||||
old_hostname = sstore.restore_state('network','hostname')
|
||||
system_hostname = get_fqdn()
|
||||
if old_hostname is not None and old_hostname != system_hostname:
|
||||
try:
|
||||
ipautil.run(['/bin/hostname', old_hostname])
|
||||
except CalledProcessError, e:
|
||||
print >>sys.stderr, "Failed to set this machine hostname back to %s (%s)." % (old_hostname, str(e))
|
||||
ipautil.restore_hostname(sstore)
|
||||
|
||||
# remove upgrade state file
|
||||
sysupgrade.remove_upgrade_file()
|
||||
|
||||
Reference in New Issue
Block a user