We might need to move just to "localhost" (hostnamed default)
so let's be prepared for changes.
---
pyanaconda/network.py | 7 ++++---
pyanaconda/ui/gui/spokes/network.py | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index b1abf0d..b0b3fd5 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -54,6 +54,7 @@ hostnameFile = "/etc/hostname"
ipv6ConfFile = "/etc/modprobe.d/ipv6.conf"
ifcfgLogFile = "/tmp/ifcfg.log"
CONNECTION_TIMEOUT = 45
+DEFAULT_HOSTNAME = "localhost.localdomain"
# part of a valid hostname between two periods (cannot start nor end with '-')
# for more info about '(?!-)' and '(?<!-)' see 're' module
documentation
@@ -157,8 +158,8 @@ def getHostname():
if not hn or hn in ('(none)', 'localhost',
'localhost.localdomain'):
hn = socket.gethostname()
- if not hn or hn in ('(none)', 'localhost'):
- hn = 'localhost.localdomain'
+ if not hn or hn in ('(none)', 'localhost',
'localhost.localdomain'):
+ hn = DEFAULT_HOSTNAME
return hn
@@ -677,7 +678,7 @@ def kickstartNetworkData(ifcfg=None, hostname=None):
kwargs["hostname"] = ifcfg.get("DHCP_HOSTNAME")
elif ifcfg.get("BOOTPROTO").lower != "dhcp":
if (hostname and
- hostname != "localhost.localdomain"):
+ hostname != DEFAULT_HOSTNAME):
kwargs["hostname"] = hostname
return handler.NetworkData(**kwargs)
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 6fd2c9d..3cae3f1 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -41,7 +41,7 @@ from pyanaconda.ui.gui.categories.software import SoftwareCategory
from pyanaconda.ui.gui.hubs.summary import SummaryHub
from pyanaconda.ui.gui.utils import gtk_call_once
-from pyanaconda.network import NetworkDevice, netscriptsDir, kickstartNetworkData,
getActiveNetDevs, logIfcfgFiles, update_hostname_data, sanityCheckHostname, getHostname
+from pyanaconda.network import NetworkDevice, netscriptsDir, kickstartNetworkData,
getActiveNetDevs, logIfcfgFiles, update_hostname_data, sanityCheckHostname, getHostname,
DEFAULT_HOSTNAME
from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient
import dbus
@@ -1062,7 +1062,7 @@ class NetworkSpoke(NormalSpoke):
communication.send_message(self.__class__.__name__, self.status)
def _update_hostname(self):
- if self.network_control_box.hostname == "localhost.localdomain":
+ if self.network_control_box.hostname == DEFAULT_HOSTNAME:
hostname = getHostname()
update_hostname_data(self.data, hostname)
self.network_control_box.hostname = self.data.network.hostname
@@ -1155,7 +1155,7 @@ class NetworkStandaloneSpoke(StandaloneSpoke):
gtk_call_once(self._update_hostname)
def _update_hostname(self):
- if self.network_control_box.hostname == "localhost.localdomain":
+ if self.network_control_box.hostname == DEFAULT_HOSTNAME:
hostname = getHostname()
update_hostname_data(self.data, hostname)
self.network_control_box.hostname = self.data.network.hostname
--
1.7.11.7