diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-10-21 20:35:56 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-10-21 20:35:56 +0000 |
| commit | a42abf38afcba0d90affa662b7d254c799de8166 (patch) | |
| tree | ca01b34e789b2f96c665470bf15647faff516fd2 | |
| parent | 879a8f11f8b213498efb53cc97dbb146a9a5a1ae (diff) | |
| download | anaconda-a42abf38afcba0d90affa662b7d254c799de8166.tar.gz anaconda-a42abf38afcba0d90affa662b7d254c799de8166.tar.xz anaconda-a42abf38afcba0d90affa662b7d254c799de8166.zip | |
fix overzealous overriding of hostname for dhcp
| -rw-r--r-- | installclass.py | 3 | ||||
| -rw-r--r-- | kickstart.py | 2 | ||||
| -rw-r--r-- | network.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/installclass.py b/installclass.py index d5f043f6f..d44ff9021 100644 --- a/installclass.py +++ b/installclass.py @@ -236,8 +236,9 @@ class BaseInstallClass: #if (todo.instClass.x): #apply (todo.instClass.x.setKeyboard, xkb) - def setHostname(self, id, hostname): + def setHostname(self, id, hostname, override = 0): id.network.setHostname(hostname); + id.network.overrideDHCPhostname = override def setNameserver(self, id, nameserver): id.network.setDNS(nameserver) diff --git a/kickstart.py b/kickstart.py index 9ea819193..5290164c8 100644 --- a/kickstart.py +++ b/kickstart.py @@ -483,7 +483,7 @@ class KickstartBase(BaseInstallClass): self.setNetwork(id, bootProto, ip, netmask, ethtool, device=device, onboot=onboot) if hostname != "": - self.setHostname(id, hostname) + self.setHostname(id, hostname, override = 1) if nameserver != "": self.setNameserver(id, nameserver) if gateway != "": diff --git a/network.py b/network.py index 99d5a1a69..28b3dada9 100644 --- a/network.py +++ b/network.py @@ -184,8 +184,6 @@ class Network: self.domains.append(info["DOMAIN"]) if info.has_key("HOSTNAME"): self.hostname = info["HOSTNAME"] - if info.has_key("BOOTPROTO") and info["BOOTPROTO"] == "dhcp": - self.overrideDHCPhostname = 1 try: f = open("/etc/resolv.conf", "r") |