summaryrefslogtreecommitdiffstats
path: root/pyanaconda/network.py
diff options
context:
space:
mode:
authorRadek Vykydal <rvykydal@redhat.com>2013-01-23 13:31:20 +0100
committerRadek Vykydal <rvykydal@redhat.com>2013-01-24 10:12:13 +0100
commit74c65510c1d9ce19c8eea52dddad14484af64c8b (patch)
tree7e73c525ba29cbeb94a86166b88843543a92c6ea /pyanaconda/network.py
parent955e4f205c6ede6156ae64704ee29d4e8f777af4 (diff)
downloadanaconda-74c65510c1d9ce19c8eea52dddad14484af64c8b.tar.gz
anaconda-74c65510c1d9ce19c8eea52dddad14484af64c8b.tar.xz
anaconda-74c65510c1d9ce19c8eea52dddad14484af64c8b.zip
Use constant for default hostname ("localhost.localdomain" currently)
We might need to move just to "localhost" (hostnamed default) so let's be prepared for changes.
Diffstat (limited to 'pyanaconda/network.py')
-rw-r--r--pyanaconda/network.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index b1abf0d3f..b0b3fd5e6 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)