kadischi/livecd_generator kadischi.py,1.24,1.25

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv693/kadischi/livecd_generator

Modified Files:
	kadischi.py 
Log Message:
New kadischi.py patch for interactove method and multi-kernels


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kadischi.py	4 Jul 2006 15:16:28 -0000	1.24
+++ kadischi.py	4 Jul 2006 16:09:08 -0000	1.25
@@ -121,7 +121,7 @@
     estimate0 = (totalsize / 2.5) ## Observed ratio for SquashFS
     estimate1 = (totalsize / 2.7) ## Observed ratio for SquashFS
 
-    print ("Estimated %s size is between %s and %s bytes" % (isoimage, estimate1, estimate0))
+    print ("[kadischi]: estimated %s size is between %s and %s bytes" % (isoimage, estimate1, estimate0))
 
     # make initrd image and pickup kernel version cause when we move files arround, it will be late
     print "[kadischi]: making initrd image"
@@ -139,11 +139,14 @@
     elif has_no_kernel and not has_no_kernel_smp:
         string.split(kernel_version, 'smp')
         string.join([kernel_version, 'smp'], '')
+        args = [mkinit, sysdir, kernel_version_smp]
     elif not has_no_kernel and not has_no_kernel_smp:
+        args = [mkinit, sysdir, kernel_version]
         args = [mkinit, sysdir, kernel_version_smp]
         execute (args)
-    args = [mkinit, sysdir, kernel_version]
-    execute (args)
+    else:
+        args = [mkinit, sysdir, kernel_version]
+        execute (args)
 
     # move files
     print "[kadischi]: moving files that should be on tmpfs"
@@ -296,7 +299,7 @@
             scripts.append(f)
     scripts.sort()
     for s in scripts:
-        rc = subprocess.call([s, sysdir])
+        rc = subprocess.call([s, sysdir, anaconda_args])
         if rc != 0:
             logging.warn("script %s exited abnormally" %(os.path.basename(s),))
 
@@ -323,4 +326,4 @@
         cleanup(builddir)
         sys.exit(1)
     cleanup(builddir)
-    sys.exit(rc)
\ No newline at end of file
+    sys.exit(rc)