diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bootloader.py | 2 | ||||
| -rw-r--r-- | packages.py | 67 | ||||
| -rw-r--r-- | yuminstall.py | 73 |
4 files changed, 80 insertions, 70 deletions
@@ -12,6 +12,14 @@ * gui.py: Remove more unused methods. + * bootloader.py (writeBootloader): Adapted to new kernelVersionList + return value. + * packages.py (copyExtraModules): Moved to yuminstall.py. + * yuminstall.py (YumBackend.copyExtraModules): Moved here from + packages.py. + (YumBackend.doPostInstall): Hookup copyExtraModules back up + (#185344). + 2006-05-17 David Cantrell <dcantrell@redhat.com> * installclass.py: Removed steps that don't exist anymore. diff --git a/bootloader.py b/bootloader.py index d3e3d5222..e9dbac163 100644 --- a/bootloader.py +++ b/bootloader.py @@ -151,7 +151,7 @@ def writeBootloader(anaconda): plainLabelUsed = 0 defkern = "kernel" - for (version, nick) in anaconda.backend.kernelVersionList(): + for (version, arch, nick) in anaconda.backend.kernelVersionList(): if plainLabelUsed: kernelList.append(("%s-%s" %(kernelLabel, nick), "%s-%s" %(kernelLongLabel, nick), diff --git a/packages.py b/packages.py index bd4897ffe..6b0173601 100644 --- a/packages.py +++ b/packages.py @@ -260,73 +260,6 @@ def migrateXinetd(instPath, instLog): stdout = logfile, stderr = logfile) os.close(logfile) -def copyExtraModules(instPath, grpset, extraModules): - kernelVersions = grpset.kernelVersionList() - foundModule = 0 - - try: - f = open("/etc/arch") - arch = f.readline().strip() - del f - except IOError: - arch = os.uname()[2] - - for (path, name) in extraModules: - if not path: - path = "/modules.cgz" - pattern = "" - names = "" - for (n, tag) in kernelVersions: - if tag == "up": - pkg = "kernel" - else: - pkg = "kernel-%s" %(tag,) - arch = grpset.hdrlist[pkg]['arch'] - # version 1 path - pattern = pattern + " %s/%s/%s.ko " % (n, arch, name) - # version 0 path - pattern = pattern + " %s/%s.ko " % (n, name) - names = names + " %s.ko" % (name,) - command = ("cd %s/lib/modules; gunzip < %s | " - "%s/bin/cpio --quiet -iumd %s" % - (instPath, path, instPath, pattern)) - log.info("running: '%s'" % (command, )) - os.system(command) - - for (n, tag) in kernelVersions: - if tag == "up": - pkg = "kernel" - else: - pkg = "kernel-%s" %(tag,) - - toDir = "%s/lib/modules/%s/updates" % \ - (instPath, n) - to = "%s/%s.ko" % (toDir, name) - - if (os.path.isdir("%s/lib/modules/%s" %(instPath, n)) and not - os.path.isdir("%s/lib/modules/%s/updates" %(instPath, n))): - os.mkdir("%s/lib/modules/%s/updates" %(instPath, n)) - if not os.path.isdir(toDir): - continue - - arch = grpset.hdrlist[pkg]['arch'] - for p in ("%s/%s.ko" %(arch, name), "%s.ko" %(name,)): - fromFile = "%s/lib/modules/%s/%s" % (instPath, n, p) - - if (os.access(fromFile, os.R_OK)): - log.info("moving %s to %s" % (fromFile, to)) - os.rename(fromFile, to) - # the file might not have been owned by root in the cgz - os.chown(to, 0, 0) - foundModule = 1 - else: - log.warning("missing DD module %s (this may be okay)" % - fromFile) - - if foundModule == 1: - for (n, tag) in kernelVersions: - recreateInitrd(n, instPath) - #Recreate initrd for use when driver disks add modules def recreateInitrd (kernelTag, instRoot): diff --git a/yuminstall.py b/yuminstall.py index c0b81c09c..e10c5f2d5 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -25,6 +25,7 @@ import urlgrabber.progress import urlgrabber.grabber import yum import rhpl +from packages import recreateInitrd from yum.constants import * from yum.Errors import RepoError, YumBaseError from yum.repos import Repository as YumRepository @@ -716,6 +717,72 @@ class YumBackend(AnacondaBackend): rc.append(g.groupid) return rc + def copyExtraModules(self, anaconda): + kernelVersions = self.kernelVersionList() + foundModule = 0 + + try: + f = open("/etc/arch") + arch = f.readline().strip() + del f + except IOError: + arch = os.uname()[2] + + for (path, name) in anaconda.id.extraModules: + if not path: + path = "/modules.cgz" + pattern = "" + names = "" + for (n, arch, tag) in kernelVersions: + if tag == "up": + pkg = "kernel" + else: + pkg = "kernel-%s" %(tag,) + + # version 1 path + pattern = pattern + " %s/%s/%s.ko " % (n, arch, name) + # version 0 path + pattern = pattern + " %s/%s.ko " % (n, name) + names = names + " %s.ko" % (name,) + command = ("cd %s/lib/modules; gunzip < %s | " + "%s/bin/cpio --quiet -iumd %s" % + (anaconda.rootPath, path, anaconda.rootPath, pattern)) + log.info("running: '%s'" % (command, )) + os.system(command) + + for (n, arch, tag) in kernelVersions: + if tag == "up": + pkg = "kernel" + else: + pkg = "kernel-%s" %(tag,) + + toDir = "%s/lib/modules/%s/updates" % \ + (anaconda.rootPath, n) + to = "%s/%s.ko" % (toDir, name) + + if (os.path.isdir("%s/lib/modules/%s" %(anaconda.rootPath, n)) and not + os.path.isdir("%s/lib/modules/%s/updates" %(anaconda.rootPath, n))): + os.mkdir("%s/lib/modules/%s/updates" %(anaconda.rootPath, n)) + if not os.path.isdir(toDir): + continue + + for p in ("%s/%s.ko" %(arch, name), "%s.ko" %(name,)): + fromFile = "%s/lib/modules/%s/%s" % (anaconda.rootPath, n, p) + + if (os.access(fromFile, os.R_OK)): + log.info("moving %s to %s" % (fromFile, to)) + os.rename(fromFile, to) + # the file might not have been owned by root in the cgz + os.chown(to, 0, 0) + foundModule = 1 + else: + log.warning("missing DD module %s (this may be okay)" % + fromFile) + + if foundModule == 1: + for (n, arch, tag) in kernelVersions: + recreateInitrd(n, anaconda.rootPath) + def selectBestKernel(self): """Find the best kernel package which is available and select it.""" @@ -1040,6 +1107,8 @@ class YumBackend(AnacondaBackend): _("Performing post install configuration..."), 6) anaconda.id.network.write(anaconda.rootPath) + self.copyExtraModules(anaconda) + for tsmbr in self.ayum.tsInfo.matchNaevr(name='rhgb'): anaconda.id.bootloader.args.append("rhgb quiet") break @@ -1064,11 +1133,11 @@ class YumBackend(AnacondaBackend): tag = ktag.rsplit('-', 1)[1] for tsmbr in self.ayum.tsInfo.matchNaevr(name=ktag): version = ( tsmbr.version + '-' + tsmbr.release + tag) - kernelVersions.append((version, nick)) + kernelVersions.append((version, tsmbr.arch, nick)) for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel'): version = ( tsmbr.version + '-' + tsmbr.release) - kernelVersions.append((version, 'up')) + kernelVersions.append((version, tsmbr.arch, 'up')) return kernelVersions |