whee! merge the first bunch of changes from the 390 branch. this

incorporates most of the python changes as well as the isys changes.

email with what hasn't been applied coming later after I either finish merging
the rest or decide to stop for the night

1 files changed, 27 insertions, 24 deletions

diff --git a/packages.py b/packages.py
index d43494f51..6d301542e 100644
--- a/packages.py
+++ b/packages.py
@@ -366,10 +366,10 @@ def doPreInstall(method, id, intf, instPath, dir):
 	# this is NICE and LATE. It lets kickstart/server/workstation
 	# installs detect this properly
 	if arch == "s390" or arch == "s390x":
-	    if (string.find(os.uname()[2], "vrdr") > -1):
-		select(id.hdList, 'kernel-vrdr')
 	    if (string.find(os.uname()[2], "tape") > -1):
 		select(id.hdList, 'kernel-tape')
+	    else:
+		select(id.hdList, 'kernel')
 	elif isys.smpAvailable():
             select(id.hdList, 'kernel-smp')
 
@@ -405,27 +405,28 @@ def doPreInstall(method, id, intf, instPath, dir):
         if pcmcia.pcicType():
             select(id.hdList, 'kernel-pcmcia-cs')
 
-        xserver = id.videocard.primaryCard().getXServer()
-        if (xserver and id.comps.packages.has_key('XFree86')
-            and id.comps.packages['XFree86'].selected
-            and xserver != "XFree86"):
-            try:
-                id.hdList['XFree86-' + xserver[5:]].selected = 1
-            except ValueError, message:
-                log ("Error selecting XFree86 server package: %s", message)
-            except KeyError:
-                log ("Error selecting XFree86 server package, "
-                     "package not available")
-
-            # XXX remove me once we have dependency resolution after
-            # videocard selection
-            try:
-                id.hdList['XFree86-compat-modules'].selected = 1
-            except ValueError, message:
-                log ("Error selecting XFree86-compat-modules package")
-            except KeyError:
-                log ("Error selecting XFree86-compat-modules, "
-                     "package not available")
+        if iutil.getArch() != "s390" and iutil.getArch() != "s390x":
+            xserver = id.videocard.primaryCard().getXServer()
+            if (xserver and id.comps.packages.has_key('XFree86')
+                and id.comps.packages['XFree86'].selected
+                and xserver != "XFree86"):
+                try:
+                    id.hdList['XFree86-' + xserver[5:]].selected = 1
+                except ValueError, message:
+                    log ("Error selecting XFree86 server package: %s", message)
+                except KeyError:
+                    log ("Error selecting XFree86 server package, "
+                         "package not available")
+
+                # XXX remove me once we have dependency resolution after
+                # videocard selection
+                try:
+                    id.hdList['XFree86-compat-modules'].selected = 1
+                except ValueError, message:
+                    log ("Error selecting XFree86-compat-modules package")
+                except KeyError:
+                    log ("Error selecting XFree86-compat-modules, "
+                         "package not available")
                 
                 
     # make sure that all comps that include other comps are
@@ -866,11 +867,13 @@ def recreateInitrd (kernelTag, instRoot):
                            searchPath = 1, root = instRoot)
                 
 
+# XXX Deprecated.  Is this ever called anymore?
 def depmodModules(comps, instPath):
     kernelVersions = comps.kernelVersionList()
 
     for (version, tag) in kernelVersions:
 	iutil.execWithRedirect ("/sbin/depmod",
-				[ "/sbin/depmod", "-a", version ],
+				[ "/sbin/depmod", "-a", version,
+                                  "-F", "/boot/System.map-" + version ],
 				root = instPath, stderr = '/dev/null')