kadischi/livecd_generator kadischi.py,1.51,1.52

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Sat Sep 23 13:42:35 UTC 2006


Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Check for bootloader options early on, bail if nothing set.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kadischi.py	22 Sep 2006 05:36:03 -0000	1.51
+++ kadischi.py	23 Sep 2006 13:42:33 -0000	1.52
@@ -46,6 +46,19 @@
     # OK, we're starting
     print "[kadischi]: Starting kadischi with root access..."
 
+    ### Check for Grub or Isolinux configuration 
+    bootloader = None
+    f = open(confdir + "/kadischi.conf").readlines()
+    for line in f:
+        if re.search("BOOTLOADER=grub", line):
+            bootloader = "grub"
+        if re.search("BOOTLOADER=isolinux", line):
+            bootloader = "isolinux"
+       
+    if bootloader == None:
+        print ("[kadischi]: No bootloader specified in %s/kadischi.conf, bailing!" % confdir)
+        sys.exit(0)
+
     # Parsing command line arguments
     # Make case for running from LiveCD
     (options, args) = parse_args ()
@@ -206,21 +219,6 @@
         execute (args)
 
         # install boot
-        ### Check for Grub or Isolinux configuration 
-        bootloader = None
-        f = open(confdir + "/kadischi.conf").readlines()
-        for line in f:
-            if re.search("BOOTLOADER=grub", line):
-                bootloader = "grub"
-            if re.search("BOOTLOADER=isolinux", line):
-                bootloader = "isolinux"
-          
-        if bootloader == None:
-            print ("[kadischi]: No bootloader specified in %s/kadischi.conf, bailing!" % confdir)
-            print "[kadischi]: cleaning up.."
-            cleanup(builddir)
-            sys.exit(0)
-             
         print "[kadischi]: installing boot & config files in compressed tree"
         boot = normalize_path([bindir, 'install-boot.sh'])
         args = [boot, sysdir, csysdir, kernel]




More information about the scm-commits mailing list