diff options
Diffstat (limited to 'pyanaconda')
| -rw-r--r-- | pyanaconda/kickstart.py | 3 | ||||
| -rw-r--r-- | pyanaconda/network.py | 28 | ||||
| -rw-r--r-- | pyanaconda/textw/network_text.py | 3 | ||||
| -rw-r--r-- | pyanaconda/vnc.py | 2 |
4 files changed, 9 insertions, 27 deletions
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 7c786ec62..6f297cbb1 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -672,7 +672,6 @@ class NetworkData(commands.network.F16_NetworkData): def execute(self): if flags.imageInstall: if self.hostname != "": - self.anaconda.network.hostname = self.hostname network.setHostname(self.hostname) # Only set hostname @@ -682,7 +681,6 @@ class NetworkData(commands.network.F16_NetworkData): # only set hostname if self.essid: if self.hostname != "": - self.anaconda.network.hostname = self.hostname network.setHostname(self.hostname) return @@ -735,7 +733,6 @@ class NetworkData(commands.network.F16_NetworkData): break if self.hostname != "": - self.anaconda.network.hostname = self.hostname network.setHostname(self.hostname) if not dev: # Only set hostname diff --git a/pyanaconda/network.py b/pyanaconda/network.py index c7f11b7a4..65ef239f6 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -94,7 +94,7 @@ def sanityCheckHostname(hostname): return None # Try to determine what the hostname should be for this system -def getDefaultHostname(anaconda): +def getHostname(): resetResolver() hn = None @@ -114,14 +114,6 @@ def getDefaultHostname(anaconda): hn = hinfo[0] break - if hn and hn not in ('(none)', 'localhost', 'localhost.localdomain'): - return hn - - try: - hn = anaconda.network.hostname - except: - hn = None - if not hn or hn in ('(none)', 'localhost', 'localhost.localdomain'): hn = socket.gethostname() @@ -436,8 +428,6 @@ class Network: def __init__(self): - self.hostname = socket.gethostname() - self.update() def update(self): @@ -460,11 +450,6 @@ class Network: else: device.setDefaultConfig() - # TODORV - the last iface in loop wins, might be ok, - # not worthy of special juggling - if device.get('HOSTNAME'): - self.hostname = device.get('HOSTNAME') - device.description = isys.getNetDevDesc(iface) self.netdevices[iface] = device @@ -494,9 +479,10 @@ class Network: if len(devNames) == 0: return + hostname = getHostname() for devName in devNames: dev = self.netdevices[devName] - line = "%s" % kickstartNetworkData(dev, self.hostname) + line = "%s" % kickstartNetworkData(dev, hostname) f.write(line) def disableNMForStorageDevices(self, anaconda): @@ -546,9 +532,9 @@ class Network: f.write("NETWORKING=yes\n") f.write("HOSTNAME=") - # use instclass hostname if set(kickstart) to override - if self.hostname: - f.write(self.hostname + "\n") + hostname = getHostname() + if hostname: + f.write(hostname + "\n") else: f.write("localhost.localdomain\n") @@ -616,7 +602,7 @@ class Network: return dracutBootArguments(self.netdevices[nic], networkStorageDevice.host_address, - self.hostname) + getHostname()) def getDevices(): # TODO: filter with existence of ifcfg file? diff --git a/pyanaconda/textw/network_text.py b/pyanaconda/textw/network_text.py index 58eb81e73..a33d7f544 100644 --- a/pyanaconda/textw/network_text.py +++ b/pyanaconda/textw/network_text.py @@ -26,8 +26,7 @@ from pyanaconda import network class HostnameWindow: def __call__(self, screen, anaconda): - hname = network.getDefaultHostname(anaconda) - anaconda.network.hostname = hname + hname = network.getHostname() return INSTALL_OK # vim:tw=78:ts=4:et:sw=4 diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py index a7ccc7643..b38f2333c 100644 --- a/pyanaconda/vnc.py +++ b/pyanaconda/vnc.py @@ -105,7 +105,7 @@ class VncServer: except Exception as e: log.debug("Exception caught trying to get host name of %s: %s" % (ipstr, e)) - self.name = network.getDefaultHostname(self.anaconda) + self.name = network.getHostname() else: if len(hinfo) == 3: self.name = hinfo[0] |