kadischi/livecd_generator kadischi.py,1.46,1.47

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Sun Sep 10 17:30:12 UTC 2006


Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Check for the right kernel last, in case of UP or SMP kernel installs on the opposite corresponding arch, or both


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kadischi.py	10 Sep 2006 16:01:01 -0000	1.46
+++ kadischi.py	10 Sep 2006 17:30:10 -0000	1.47
@@ -405,10 +405,10 @@
         if kernel != None and kernel_smp != None:
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel_smp))
-        elif kernel != None and kernel_smp == None:
-            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
         elif kernel == None and kernel_smp != None:
             os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel_smp))
+        elif kernel != None and kernel_smp == None:
+            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
         else:
             print >> sys.stderr, "\n\nCouldn't determine kernel version!"
             sys.exit(1)




More information about the scm-commits mailing list