diff options
author | Peter Jones <pjones@redhat.com> | 2008-06-17 14:34:38 -0400 |
---|---|---|
committer | Peter Jones <pjones@pjones2.localdomain> | 2008-06-17 14:34:38 -0400 |
commit | 3c14bef35fa32c9f25312226a3144ba5f8c13eba (patch) | |
tree | 1fc6e9e488b71efc3e21f702e984a741ea6d6f1e | |
parent | e828c83233bf9579ff327b2e86adc1062dcdcc74 (diff) | |
download | anaconda-3c14bef35fa32c9f25312226a3144ba5f8c13eba.tar.gz anaconda-3c14bef35fa32c9f25312226a3144ba5f8c13eba.tar.xz anaconda-3c14bef35fa32c9f25312226a3144ba5f8c13eba.zip |
Fix pkgorder to include deps of kernel early.
-rwxr-xr-x | scripts/pkgorder | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/pkgorder b/scripts/pkgorder index f72249c73..bc80c7876 100755 --- a/scripts/pkgorder +++ b/scripts/pkgorder @@ -107,6 +107,13 @@ def printMatchingPkgs(fpattern): processed[mname] = True print mname +def addPackages(ds, pkgLst): + ds.initActionTs() + for pkg in pkgLst: + ds.install(pattern=pkg) + ds.resolveDeps() + processTransaction(ds) + def addGroups(ds, groupLst): ds.initActionTs() map(ds.selectGroup, filter(lambda x: ds.comps.has_group(x), groupLst)) @@ -163,7 +170,7 @@ if __name__ == "__main__": arch = "i686" # print out kernel related packages first - printMatchingPkgs("kernel-*") + #printMatchingPkgs("kernel-*") if os.environ.has_key('TMPDIR'): testpath = "%s/pkgorder-%d" %(os.environ['TMPDIR'],os.getpid(),) @@ -174,12 +181,12 @@ if __name__ == "__main__": ds = PackageOrderer(arch=arch) ds.setup(fn=config, excludes=options.excludeList, root = testpath) + + # hack, hack, hack... make sure iscsi ends up on disc1 (#208832) + addPackages(ds, ["kernel-*","mkinitrd","mdadm"]) addGroups(ds, ["core", "base", "text-internet"]) - # hack, hack, hack... make sure iscsi ends up on disc1 (#208832) - printMatchingPkgs("iscsi-*") - addGroups(ds, ["base-x", "dial-up", "graphical-internet", "editors", "gnome-desktop", "sound-and-video", "printing", |