kadischi/livecd_generator install-boot.sh, 1.13, 1.14 kadischi.py, 1.48, 1.49

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Mon Sep 18 05:45:28 UTC 2006


Author: autopsy

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

Modified Files:
	install-boot.sh kadischi.py 
Log Message:
Add Grub/Isolinux configuration for bootloader


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- install-boot.sh	1 Sep 2006 02:40:33 -0000	1.13
+++ install-boot.sh	18 Sep 2006 05:45:26 -0000	1.14
@@ -33,6 +33,32 @@
    kernel_params="$kernel_params rhgb"
 fi
 
+### Begin Grub bootloader configuration
+if [ "$BOOTLOADER" == "grub" ]; then
+
+    mkdir -p $csysdir/boot/grub
+    cp /usr/share/grub/i386-redhat/stage2_eltorito $csysdir/boot/grub/
+    cp /boot/grub/splash.xpm.gz $csysdir/boot/grub/
+
+    cp $sysdir/boot/isolinux/initrd.img $csysdir/boot/
+    cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/
+
+    cat > $csysdir/boot/grub/grub.conf <<_EOF_
+default=0
+timeout=10
+splashimage=/boot/grub/splash.xpm.gz
+hiddenmenu
+title Fedora Core ($kernel)
+   root(cd)
+   kernel /boot/vmlinuz-$kernel quiet $kernel_params ramdisk_size=65536
+   initrd /boot/initrd.img
+title Fedora Core ($kernel debug)
+   root(cd)
+   kernel /boot/vmlinuz INITRD_DBG=x
+   initrd /boot/initrd.img
+_EOF_
+### End Grub bootloader configuration
+else
 if [ -f $sysdir/boot/isolinux/initrd.smp.img ] && [ -f $sysdir/boot/isolinux/initrd.img ]; then
         /bin/cp $sysdir/boot/isolinux/initrd.smp.img $csysdir/boot/isolinux/initrd_s.img
         /bin/cp $sysdir/boot/vmlinuz-$kernel_version_proper'smp' $csysdir/boot/isolinux/vmlinuzsmp
@@ -190,3 +216,4 @@
   append -
 _EOF_
 fi
+fi


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kadischi.py	15 Sep 2006 01:41:25 -0000	1.48
+++ kadischi.py	18 Sep 2006 05:45:26 -0000	1.49
@@ -202,6 +202,20 @@
         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)
+            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]
@@ -216,19 +230,35 @@
         # delete sysdir - we don`t need it anymore
         print "[kadischi]: removing uncompressed tree"
         cleanup(sysdir)
-
-        # create iso image
-        print "[kadischi]: creating iso image %s" % isoimage
-        args = ["/usr/bin/mkisofs", "-quiet", "-R",
-            "-V", dist,
-            "-b", "boot/isolinux/isolinux.bin",
-            "-c", "boot/isolinux/boot.cat",
-            "-p", myname,
-            "-x", "lost+found",
-            "-no-emul-boot", "-boot-load-size", "4", "-boot-info-table",
-            "-o", isoimage,
-            csysdir]
-        execute (args)
+        
+        # make iso
+        ### Again. check for Grub or Isolinux configuration
+        if bootloader == "grub":
+            args = ["/usr/bin/mkisofs", "-quiet", "-R",
+                "-V", dist,
+                "-b", "boot/grub/stage2_eltorito",
+                "-p", myname,
+                "-x", "lost+found",
+                "-no-emul-boot", "-boot-load-size", "4", "-boot-info-table",
+                "-o", isoimage,
+                csysdir]
+            execute(args)
+        elif bootloader == "isolinux":
+            print "[kadischi]: creating iso image %s" % isoimage
+            args = ["/usr/bin/mkisofs", "-quiet", "-R",
+                "-V", dist,
+                "-b", "boot/isolinux/isolinux.bin",
+                "-c", "boot/isolinux/boot.cat",
+                "-p", myname,
+                "-x", "lost+found",
+                "-no-emul-boot", "-boot-load-size", "4", "-boot-info-table",
+                "-o", isoimage,
+                csysdir]
+            execute (args)
+        else:
+            print ("[kadischi]: Unsupported bootloader configuration, bailing!" % (bootloader, confdir))
+            cleanup(builddir)
+            sys.exit(0)
 
         # delete builddir
         print "[kadischi]: removing builddir."




More information about the scm-commits mailing list