kadischi/livecd_generator kadischi.py,1.56,1.57

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	kadischi.py 
Log Message:
Correct bootloader checking when inside LiveCD


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kadischi.py	16 Apr 2007 15:30:36 -0000	1.56
+++ kadischi.py	17 Apr 2007 04:30:02 -0000	1.57
@@ -47,17 +47,18 @@
     print "[kadischi]: Starting kadischi as UID 0..."
 
     ### 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 not os.access("/.livecd", os.R_OK):
+        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)
+        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
@@ -328,7 +329,7 @@
 
 def parse_args():
     """ process command line options for anaconda """
-    usage = 'usage: %prog [options] <repository> <image>\n\nConsult the documentation at: http://fedoraproject.org/wiki/Kadischi/Documentation'
+    usage = 'usage: %prog [options] <repository> <image>\n\nConsult the documentation at: http://fedoraproject.org/wiki/Kadischi/Documentation\n\nFor LiveCD or LiveDVD installs to disk use: %prog [options] <repository>'
     verstr = '%prog ' + version
     parser = optparse.OptionParser(usage=usage, version=verstr)
     parser.add_option ("-f", "--force", dest="force", action="store_true", default=False, help="Overwrite existing image file, if it exists")