massive merge from taroon branch. changes are all over the place, but a

summary of looking through the diff is
* clean up warnings, we build with -Wall -Werror here too
* product.img stuff
* max logical partitions enforcement
* 1 TB max fs size
* ethtool stuff
* autopart in kickstart
* driver disk fixes
* RHEL upgrade stuff
* network driver disks
* variant pkgorder/tree splitting

1 files changed, 18 insertions, 14 deletions

diff --git a/packages.py b/packages.py
index 60f6b1742..614597bbf 100644
--- a/packages.py
+++ b/packages.py
@@ -1177,24 +1177,34 @@ def migrateXinetd(instPath, instLog):
 def copyExtraModules(instPath, grpset, extraModules):
     kernelVersions = grpset.kernelVersionList()
 
+    try:
+        f = open("/etc/arch")
+        arch = f.readline().strip()
+        del f
+    except IOError:
+        arch = os.uname()[2]
+
     for (path, subdir, name) in extraModules:
         if not path:
             path = "/modules.cgz"
 	pattern = ""
 	names = ""
 	for (n, tag) in kernelVersions:
-	    pattern = pattern + " " + n + "/" + name + ".o"
-	    names = names + " " + name + ".o"
+            # version 1 path
+            pattern = pattern + " %s/%s/%s.o " % (n, arch, name)
+            # version 0 path
+            pattern = pattern + " %s/%s.o " % (n, name)
+            names = names + " %s.o" % (name,)
 	command = ("cd %s/lib/modules; gunzip < %s | "
-                   "%s/bin/cpio  --quiet -iumd %s" % 
+                   "%s/bin/cpio --quiet -iumd %s" % 
                    (instPath, path, instPath, pattern))
 	log("running: '%s'" % (command, ))
 	os.system(command)
 
 	for (n, tag) in kernelVersions:
 	    fromFile = "%s/lib/modules/%s/%s.o" % (instPath, n, name)
-	    toDir = "%s/lib/modules/%s/kernel/drivers/%s" % \
-		    (instPath, n, subdir)
+	    toDir = "%s/lib/modules/%s/updates" % \
+		    (instPath, n)
 	    to = "%s/%s.o" % (toDir, name)
 
 	    if (os.access(fromFile, os.R_OK) and 
@@ -1214,17 +1224,11 @@ def copyExtraModules(instPath, grpset, extraModules):
 #Recreate initrd for use when driver disks add modules
 def recreateInitrd (kernelTag, instRoot):
     log("recreating initrd for %s" % (kernelTag,))
-    if iutil.getArch() == 'ia64':
-        initrd = "/boot/efi/EFI/redhat/initrd-%s.img" % (kernelTag, )
-    else:
-        initrd = "/boot/initrd-%s.img" % (kernelTag, )
-
-    iutil.execWithRedirect("/sbin/mkinitrd",
-                           [ "/sbin/mkinitrd", "--ifneeded", "-f",
-                             initrd, kernelTag ],
+    iutil.execWithRedirect("/sbin/new-kernel-pkg",
+                           [ "/sbin/new-kernel-pkg", "--mkinitrd",
+                             "--depmod", "--install", kernelTag ],
                            stdout = None, stderr = None,
                            searchPath = 1, root = instRoot)
-                
 
 # XXX Deprecated.  Is this ever called anymore?
 def depmodModules(comps, instPath):