diff options
| -rwxr-xr-x | anaconda | 2 | ||||
| -rw-r--r-- | installclass.py | 7 | ||||
| -rw-r--r-- | instdata.py | 1 | ||||
| -rw-r--r-- | iw/package_gui.py | 4 | ||||
| -rw-r--r-- | loader2/hardware.c | 4 | ||||
| -rw-r--r-- | loader2/linuxrc.s390 | 2 | ||||
| -rw-r--r-- | network.py | 4 | ||||
| -rw-r--r-- | packages.py | 4 | ||||
| -rw-r--r-- | rescue.py | 3 | ||||
| -rw-r--r-- | scripts/mk-images.ppc | 12 | ||||
| -rw-r--r-- | textw/desktop_choice_text.py | 2 | ||||
| -rw-r--r-- | textw/timezone_text.py | 9 | ||||
| -rw-r--r-- | upgradeclass.py | 5 |
13 files changed, 42 insertions, 17 deletions
@@ -758,7 +758,7 @@ if not instClass: instClass = DefaultInstall(flags.expert) if len(availableClasses(showHidden = 1)) < 2: - (cname, cobject, clogo) = availableClasses()[0] + (cname, cobject, clogo) = availableClasses(showHidden = 1)[0] log("%s is only installclass, using it" %(cname,)) instClass = cobject(flags.expert) diff --git a/installclass.py b/installclass.py index eab704f98..acb7868f3 100644 --- a/installclass.py +++ b/installclass.py @@ -181,7 +181,7 @@ class BaseInstallClass: if not floppyDevices: dispatch.skipStep("bootdisk") - if iutil.getArch() != "i386" or iutil.getArch() != "x86_64": + if iutil.getArch() != "i386" and iutil.getArch() != "x86_64": dispatch.skipStep("bootloader") # 'noupgrade' can be used on the command line to force not looking @@ -461,8 +461,9 @@ class BaseInstallClass: raise RuntimeError, "Unknown videocard specified: %s" %(card,) if videoRam: - id.videocard.primaryCard().setVideoRam(videoRam) - id.xsetup.xhwstate.set_videocard_ram(videoRam) + # FIXME: this required casting is ugly + id.videocard.primaryCard().setVideoRam(str(videoRam)) + id.xsetup.xhwstate.set_videocard_ram(int(videoRam)) if server is not None: log("unable to really do anything with server right now") diff --git a/instdata.py b/instdata.py index 437c82347..2746ecb74 100644 --- a/instdata.py +++ b/instdata.py @@ -115,7 +115,6 @@ class InstallData: self.mouse.write(instPath) self.keyboard.write (instPath) - self.network.write (instPath) self.timezone.write (instPath) self.auth.write (instPath) self.firewall.write (instPath) diff --git a/iw/package_gui.py b/iw/package_gui.py index 578566e97..4457271d1 100644 --- a/iw/package_gui.py +++ b/iw/package_gui.py @@ -954,6 +954,10 @@ class PackageSelectionWindow (InstallWindow): everythingComp = None everythingCB = None for par in parlist: + # don't show the top-level if there aren't any groups in it + if len(pardict[par]) == 0: + continue + # set the background to our selection color eventBox = gtk.EventBox() eventBox.modify_bg(gtk.STATE_NORMAL, diff --git a/loader2/hardware.c b/loader2/hardware.c index 633baf346..4d0e8f68c 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -297,8 +297,8 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, if(fd) { line = (char *)malloc(sizeof(char) * 200); while (fgets (line, 199, fd) != NULL) { - if((parms = strstr(line, " dasd=")) || - (parms = strstr(line, " DASD="))) { + if((parms = strstr(line, "dasd=")) || + (parms = strstr(line, "DASD="))) { parms++; strncpy(parms, "dasd", 4); parms_end = parms; diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390 index 849eb211c..65f0d38e7 100644 --- a/loader2/linuxrc.s390 +++ b/loader2/linuxrc.s390 @@ -229,13 +229,11 @@ if [ ":$NETTYPE" = ":ctc" -o ":$NETTYPE" = ":escon" ]; then insmod fsm$LO insmod ctc$LO ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY - route add -host $IPADDR dev $DEVICE 2>/dev/null elif [ ":$NETTYPE" = ":iucv" ]; then insmod fsm$LO insmod iucv$LO insmod netiucv$LO $IUCV ifconfig $DEVICE $IPADDR $MMTU pointopoint $GATEWAY - route add -host $IPADDR dev $DEVICE 2>/dev/null if [ -n "$IUCV" ]; then echo "options netiucv $IUCV" >> /tmp/modules.conf fi diff --git a/network.py b/network.py index 1d0de99e1..7f03055ec 100644 --- a/network.py +++ b/network.py @@ -362,6 +362,10 @@ class Network: f.write("\n"); def write(self, instPath): + # make sure the directory exists + if not os.path.isdir("%s/etc/sysconfig/network-scripts" %(instPath,)): + iutil.mkdirChain("%s/etc/sysconfig/network-scripts" %(instPath,)) + # /etc/sysconfig/network-scripts/ifcfg-* for dev in self.netdevices.values(): device = dev.get("device") diff --git a/packages.py b/packages.py index e0fec978e..f850f1d99 100644 --- a/packages.py +++ b/packages.py @@ -982,6 +982,10 @@ def doPostInstall(method, id, intf, instPath): if arch == "i386": pcmcia.createPcmciaConfig( instPath + "/etc/sysconfig/pcmcia") + + # we need to write out the network bits before kudzu runs + # to avoid getting devices in the wrong order (#102276) + id.network.write(instPath) w.set(3) @@ -162,7 +162,8 @@ def startNetworking(network, intf): def runRescue(instPath, mountroot, id): - for file in [ "services", "protocols", "group", "joe", "man.config" ]: + for file in [ "services", "protocols", "group", "joe", "man.config", + "nsswitch.conf" ]: os.symlink('/mnt/runtime/etc/' + file, '/etc/' + file) # see if they would like networking enabled diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index adc5d3a14..c24a9a76d 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -37,7 +37,7 @@ makeBootImages() { pushd $TOPDESTPATH/ppc/chrp cp $IMGPATH/usr/share/ppc64-utils/zImage.lds $TOPDESTPATH/ppc/chrp/zImage.lds - $IMGPATH/usr/bin/mkzimage $KERNELROOT/boot/vmlinuz-partial* $TOPDESTPATH/images/boot.img $TOPDESTPATH/ppc/chrp/ramdisk.image.gz + $IMGPATH/usr/bin/mkzimage $KERNELROOT/boot/vmlinuz-partial* $TOPDESTPATH/images/netboot.img $TOPDESTPATH/ppc/chrp/ramdisk.image.gz rm -f $TOPDESTPATH/ppc/chrp/zImage.lds popd @@ -51,6 +51,16 @@ makeBootImages() { cp $TOPDESTPATH/boot_image $TOPDESTPATH/isopath/boot_image mkisofs -generic-boot $TOPDESTPATH/isopath/boot_image -A "$PRODUCT $VERSION" -V "PBOOT" -J -R -T -allow-multidot -l -o $TOPDESTPATH/images/boot.iso $TOPDESTPATH/isopath rm -rf $TOPDESTPATH/isopath/ + + cat > $TOPDESTPATH/images/README <<EOF +The files in this directory are for use in booting a pSeries +machine. They are as follows: +boot.iso - A bootable CD-ROM image for starting an installation on pSeries +netboot.img - A network boot image for starting an installation on pSeries + +Images for installing on an iSeries machine can be found in the ppc/iSeries +directory. +EOF elif [ "$KERNELARCH" = "ppc64iseries" ]; then mkdir -p $TOPDESTPATH/ppc/iSeries diff --git a/textw/desktop_choice_text.py b/textw/desktop_choice_text.py index 510bbb07b..2a5a96140 100644 --- a/textw/desktop_choice_text.py +++ b/textw/desktop_choice_text.py @@ -32,7 +32,7 @@ class DesktopChoiceWindow: "you may customize the selection of software " "installed if you want.") - toplevel.add (TextboxReflowed(55, _(labeltxt) % (productName, productName)), 0, 0, (0, 0, 0, 1)) + toplevel.add (TextboxReflowed(55, _(labeltxt) % (productName,)), 0, 0, (0, 0, 0, 1)) custom = not dispatch.stepInSkipList("package-selection") customize = Checkbox (_("Customize software selection"), custom) toplevel.add (customize, 0, 3, (0, 0, 0, 1)) diff --git a/textw/timezone_text.py b/textw/timezone_text.py index 3aa6a8d87..57f8d5e57 100644 --- a/textw/timezone_text.py +++ b/textw/timezone_text.py @@ -88,8 +88,13 @@ class TimezoneWindow: self.l.setCurrent(default) # self.l.setCallback(self.updateClock) - - self.c = Checkbox(_("Hardware clock set to GMT?"), isOn = asUtc) + + # avoid breaking string freeze while still making it so that + # we have the same string as in gui + txt = _("System clock uses _UTC") + txt = txt.replace("_", "") + + self.c = Checkbox(txt, isOn = asUtc) # self.c.setCallback(self.updateSysClock) self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone", diff --git a/upgradeclass.py b/upgradeclass.py index 1210ffe09..4a41ee041 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -43,13 +43,12 @@ class InstallClass(BaseInstallClass): "postinstallconfig", "instbootloader", "dopostaction", - "bootdisk", + "bootdisk", "methodcomplete", "complete" ) - if iutil.getArch() == "alpha" or iutil.getArch() == "ia64": - dispatch.skipStep("bootdisk") + if iutil.getArch() != "i386" and iutil.getArch() != "x86_64": dispatch.skipStep("bootloader") dispatch.skipStep("bootloaderadvanced") |