diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | findpackageset.py | 6 | ||||
| -rw-r--r-- | installclass.py | 10 | ||||
| -rw-r--r-- | network.py | 10 |
4 files changed, 28 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2005-02-08 Paul Nasrat <pnasrat@redhat.com> + + * findpackageset.py: + Don't use rpm.archscore as iseries upgrades don't work (#146915) + + * installclass.py, network.py: + Only configure ksdevice if no --device (#138852) + 2005-02-07 Chris Lumens <clumens@redhat.com> * gui.py (helpClicked, refreshHelp): If help is disabled, don't diff --git a/findpackageset.py b/findpackageset.py index df9904136..bb21691a4 100644 --- a/findpackageset.py +++ b/findpackageset.py @@ -43,12 +43,12 @@ def comparePackageForUpgrade(updDict, h, pkg): def findBestArch(archlist): bestarch = None for availarch in archlist: - newscore = rpm.archscore(availarch) + newscore = rhpl.arch.score(availarch) # unsupported if newscore <= 0: continue # If old arch is better or same - if bestarch and rpm.archscore(bestarch) <= newscore: + if bestarch and rhpl.arch.score(bestarch) <= newscore: continue # If we get here we're better @@ -61,7 +61,7 @@ def getAvailPackages(hdrlist): pkgDict = {} nameDict = {} for h in hdrlist: - score1 = rpm.archscore(h[rpm.RPMTAG_ARCH]) + score1 = rhpl.arch.score(h[rpm.RPMTAG_ARCH]) if (score1): name = h[rpm.RPMTAG_NAME] arch = h[rpm.RPMTAG_ARCH] diff --git a/installclass.py b/installclass.py index 7daa2dfdc..1e433d788 100644 --- a/installclass.py +++ b/installclass.py @@ -320,11 +320,15 @@ class BaseInstallClass: def setNetwork(self, id, bootProto, ip, netmask, ethtool, device = None, onboot = 1, dhcpclass = None, essid = None, wepkey = None): if bootProto: devices = id.network.available () + firstdev = id.network.getFirstDeviceName() if (devices and bootProto): if not device: - list = devices.keys () - list.sort() - device = list[0] + if devices.has_key(firstdev): + device = firstdev + else: + list = devices.keys () + list.sort() + device = list[0] dev = devices[device] dev.set (("bootproto", bootProto)) dev.set (("dhcpclass", dhcpclass)) diff --git a/network.py b/network.py index 6d2363bf9..efcab6d7c 100644 --- a/network.py +++ b/network.py @@ -247,6 +247,13 @@ class Network: return self.firstnetdevice def available(self): + ksdevice = None + cmdline = open("/proc/cmdline").read() + if cmdline.find("ksdevice=") != -1: + ksdevice = \ + cmdline[cmdline.index("ksdevice="):].split(" ")[0] + ksdevice = ksdevice.split("=")[1].strip() + f = open("/proc/net/dev") lines = f.readlines() f.close() @@ -266,6 +273,9 @@ class Network: except Exception, e: log("exception getting mac addr: %s" %(e,)) + if ksdevice and self.netdevices.has_key(ksdevice): + self.firstnetdevice = ksdevice + return self.netdevices def setHostname(self, hn): |