From 77fdf6f7c72621127ca535722557b11c6c299086 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 13 Oct 2011 17:58:27 -0400 Subject: Save the value of hostname even if it doesn't appear in /etc/sysconfig/network https://fedorahosted.org/freeipa/ticket/1871 --- ipapython/platform/redhat.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ipapython/platform/redhat.py b/ipapython/platform/redhat.py index 9825ddfd3..5ac310609 100644 --- a/ipapython/platform/redhat.py +++ b/ipapython/platform/redhat.py @@ -23,6 +23,7 @@ import re import os import stat import sys +import socket from ipapython import ipautil from ipapython.platform import base @@ -133,6 +134,7 @@ def restore_context(filepath): ipautil.run(["/sbin/restorecon", filepath], raiseonerr=False) def backup_and_replace_hostname(fstore, statestore, hostname): + old_hostname = socket.gethostname() try: ipautil.run(['/bin/hostname', hostname]) except ipautil.CalledProcessError, e: @@ -144,4 +146,5 @@ def backup_and_replace_hostname(fstore, statestore, hostname): restore_context("/etc/sysconfig/network") if 'HOSTNAME' in old_values: statestore.backup_state('network', 'hostname', old_values['HOSTNAME']) - + else: + statestore.backup_state('network', 'hostname', old_hostname) -- cgit