From 3105f614b92cebd202d473d980326f534d2f0c02 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 18 May 2004 03:45:34 +0000 Subject: merge anaconda-10_0-branch changes back to HEAD --- Makefile.inc | 2 +- bootloader.py | 1 + command-stubs/mknod-stub | 2 +- fsset.py | 2 +- gui.py | 4 ++++ hdrlist.py | 7 +++++++ iutil.py | 2 +- loader2/modstubs.c | 7 ++++++- packages.py | 29 ++++++++--------------------- partedUtils.py | 1 + scripts/mk-images.s390 | 2 +- upgradeclass.py | 2 +- 12 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index bd4ee6100..8e4de70df 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -2,7 +2,7 @@ # define destination locations # VERSION = 10.0 -RELEASE = 1 +RELEASE = 5 TIMESTAMP := $(shell date "+.%Y%m%d%H%M%S") SNAPRELEASE := $(RELEASE)$(TIMESTAMP) diff --git a/bootloader.py b/bootloader.py index bab3291cf..0b136cc2f 100644 --- a/bootloader.py +++ b/bootloader.py @@ -126,6 +126,7 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps): if kernelLabel is None: log("unable to find default image, bailing") + return plainLabelUsed = 0 for (version, nick) in comps.kernelVersionList(): diff --git a/command-stubs/mknod-stub b/command-stubs/mknod-stub index f7491eabf..53fd44c17 100755 --- a/command-stubs/mknod-stub +++ b/command-stubs/mknod-stub @@ -26,7 +26,7 @@ def main(): while (drive.find('/') != -1): if (drive.startswith("cciss") or drive.startswith("ida") or drive.startswith("rd") or drive.startswith("ataraid") - or drive.startswith("iseries")): + or drive.startswith("iseries") or drive.startswith("i2o")): break drive = drive[drive.find('/') + 1:] isys.makeDevInode(drive, path) diff --git a/fsset.py b/fsset.py index bfa2b888e..56c7cd0f7 100644 --- a/fsset.py +++ b/fsset.py @@ -810,7 +810,7 @@ class prepbootFileSystem(FileSystemType): def getDiskPart(dev): cut = len(dev) if (dev.startswith('rd/') or dev.startswith('ida/') or - dev.startswith('cciss/')): + dev.startswith('cciss/') or dev.startswith('i2o/')): if dev[-2] == 'p': cut = -1 elif dev[-3] == 'p': diff --git a/gui.py b/gui.py index cdf42fb4f..66066a613 100755 --- a/gui.py +++ b/gui.py @@ -773,6 +773,10 @@ class InstallControlWindow: suffixList.append("-%s.html" % (lang,)) suffixList.append(".%s" % (lang,)) else: + # XXX hack to work around #116170 + suffixList.append("-en.html") + suffixList.append("-en") + suffixList.append(".html") suffixList.append("") diff --git a/hdrlist.py b/hdrlist.py index fcc55ceab..ec1ed683b 100644 --- a/hdrlist.py +++ b/hdrlist.py @@ -376,6 +376,13 @@ class HeaderList: arches = (rhpl.arch.getBaseArch(), rhpl.arch.canonArch) else: arches = (rhpl.arch.canonArch, ) + + # FIXME: this is a bad bad bad hack. we should probably tag + # the kernel in the comps file somehow instead. basearchonly + # was sort of intended for this, but ppc is kind of backwards on + # what basearch means :/ + if item == "kernel": + arches = (rhpl.arch.canonArch,) for basearch in arches: for (nevra, arch) in self.pkgnames[item]: diff --git a/iutil.py b/iutil.py index 7aa0755bd..776e4b842 100644 --- a/iutil.py +++ b/iutil.py @@ -455,7 +455,7 @@ def makeDriveDeviceNodes(): num = 15 if (drive.startswith("cciss") or drive.startswith("ida") or - drive.startswith("rd")): + drive.startswith("rd") or drive.startswith("i2o")): sep = "p" else: sep = "" diff --git a/loader2/modstubs.c b/loader2/modstubs.c index 70337ae63..0ae4e1e1a 100644 --- a/loader2/modstubs.c +++ b/loader2/modstubs.c @@ -131,7 +131,12 @@ int ourInsmodCommand(int argc, char ** argv) { return 1; } - rc = init_module(modbuf, sb.st_size, ""); + if (argc > 2) { + /* FIXME: only allows one param */ + rc = init_module(modbuf, sb.st_size, argv[2]); + } else { + rc = init_module(modbuf, sb.st_size, ""); + } if (rc != 0) logMessage("failed to insert module (%d)", errno); return rc; diff --git a/packages.py b/packages.py index b6af4d243..beaacb320 100644 --- a/packages.py +++ b/packages.py @@ -691,10 +691,12 @@ def doPreInstall(method, id, intf, instPath, dir): # if you're upgrading from a 2.4 dist so that we can get the # transition right if (os.path.exists(instPath + "/etc/modules.conf") and - os.path.exists(instPath + "/etc/modprobe.conf")): + os.path.exists(instPath + "/etc/modprobe.conf") and + not os.path.exists(instPath + "/etc/modprobe.conf.anacbak")): log("renaming old modprobe.conf -> modprobe.conf.anacbak") os.rename(instPath + "/etc/modprobe.conf", instPath + "/etc/modprobe.conf.anacbak") + if method.systemMounted (id.fsset, instPath): id.fsset.umountFilesystems(instPath) @@ -748,20 +750,16 @@ def doPreInstall(method, id, intf, instPath, dir): # write out the fstab if not upgrade: id.fsset.write(instPath) - - # rootpath mode doesn't have this file around - # we need this on upgrades now that we move the old modprobe.conf - # out of the way and let kudzu regen stuff. otherwise, initrds - # won't end up being right - if os.access("/tmp/modprobe.conf", os.R_OK): - iutil.copyFile("/tmp/modprobe.conf", - instPath + "/etc/modprobe.conf") + # rootpath mode doesn't have this file around + if os.access("/tmp/modprobe.conf", os.R_OK): + iutil.copyFile("/tmp/modprobe.conf", + instPath + "/etc/modprobe.conf") # make a /etc/mtab so mkinitrd can handle certain hw (usb) correctly f = open(instPath + "/etc/mtab", "w+") f.write(id.fsset.mtab()) f.close() - + # delay writing migrate adjusted fstab till later, in case # rpm transaction set determines they don't have enough space to upgrade # else: @@ -1075,9 +1073,6 @@ def doPostInstall(method, id, intf, instPath): w.set(3) - # we need to run kudzu on upgrades now so that modprobe.conf - # gets generated right - if 1: # blah. If we're on a serial mouse, and we have X, we need to # close the mouse device, then run kudzu, then open it again. @@ -1173,14 +1168,6 @@ def doPostInstall(method, id, intf, instPath): # of working afterwards. FIXME: this is a hack migrateMouseConfig(instPath, instLogName) - # bye-bye to old modules.conf (see above comment wrt modprobe.conf) - if (os.path.exists(instPath + "/etc/modules.conf") and - os.path.exists(instPath + "/etc/modprobe.conf")): - log("renaming old modules.conf -> modprobe.conf.pre26") - os.rename(instPath + "/etc/modules.conf", - instPath + "/etc/modules.conf.pre26") - - w.set(5) # FIXME: hack to install the comps package diff --git a/partedUtils.py b/partedUtils.py index a5f88bbf4..72527b2ee 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -1065,6 +1065,7 @@ max_logical_partition_count = { "ataraid/": 11, "rd/": 3, "cciss/": 11, + "i2o/": 11, "iseries/vd": 3, "ida/": 11 } diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390 index f8b711304..024f734b8 100644 --- a/scripts/mk-images.s390 +++ b/scripts/mk-images.s390 @@ -16,7 +16,7 @@ SECSTAGE="$IDEMODS $SCSIMODS $FSMODS md raid0 raid1 raid5 dm-mod" DASDMODS=" dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod" COMMONMODULES="loop cramfs tape390 isofs $DASDMODS" LOCALMODULES="$COMMONMODULES tape390 $IDEMODS $SCSIMODS" -NETWORKMODULES="$COMMONMODULES nfs ctc netiucv smsgiucv lcs qdio qeth_mod ccwgroup" +NETWORKMODULES="$COMMONMODULES nfs ctc netiucv smsgiucv lcs qdio qeth ccwgroup" makeBootImages() { makeinitrd --nobogl --initrdto $TOPDESTPATH/images/initrd.img \ diff --git a/upgradeclass.py b/upgradeclass.py index d263bf0eb..6a6f02b5e 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -48,7 +48,7 @@ class InstallClass(BaseInstallClass): dispatch.skipStep("bootloader") dispatch.skipStep("bootloaderadvanced") - if iutil.getArch() != "i386": + if iutil.getArch() != "i386" and iutil.getArch() != "x86_64": dispatch.skipStep("upgbootloader") def setInstallData(self, id): -- cgit