kadischi/livecd_generator install-boot.sh,1.15,1.16

Jasper O'neal Hartline (autopsy) fedora-extras-commits at redhat.com
Mon Apr 16 23:12:34 UTC 2007


Author: autopsy

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

Modified Files:
	install-boot.sh 
Log Message:
Modifications for Xen kernels, buildstamp file modifications


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- install-boot.sh	16 Apr 2007 15:30:36 -0000	1.15
+++ install-boot.sh	16 Apr 2007 23:12:32 -0000	1.16
@@ -1,4 +1,5 @@
 #!/bin/bash
+#set -x
 
 sysdir=$1
 csysdir=$2
@@ -8,7 +9,7 @@
 kernel_is_xenU=$(echo $kernel | /bin/grep -G [[:alnum:]]xenU)
 kernel_is_smp=$(echo $kernel | /bin/grep -G [[:alnum:]]smp)
 kernel_is_up=$(echo $kernel | grep -v smp)
-kernel_version_proper=$(echo $kernel | /bin/sed -e 's|xen0||' | /bin/sed -e 's|xenU||')
+kernel_version_proper=$(echo $kernel | /bin/sed -e 's|xen0||' | /bin/sed -e 's|xenU||' | /bin/sed -e 's|xen||')
 kernel_params='selinux=0'
 
  . /etc/kadischi/kadischi.conf
@@ -127,7 +128,7 @@
 _EOF_
 fi
  
-if [ ! $kernel_is_xen0 ] && [ ! $kernel_is_xenU ]; then
+if [ ! $kernel_is_xen0 ] && [ ! $kernel_is_xenU ] && [ ! $kernel_is_xen ]; then
     if [ -f $csysdir/boot/isolinux/initrd.smp.img ] && [ -f $csysdir/boot/isolinux/initrd.img ]; then
        if [ -d $INSTALLDIR/bootsplash ]; then
             /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
@@ -158,7 +159,7 @@
   append -
 _EOF_
     fi
-elif [ $kernel_is_xen0 ]; then
+elif [ -n $kernel_is_xen0 ]; then
    if [ -d $INSTALLDIR/bootsplash ]; then
         /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
    else
@@ -187,7 +188,7 @@
   kernel memtest
   append -
 _EOF_
-elif [ $kernel_is_xenU ]; then
+elif [ -n $kernel_is_xenU ]; then
    if [ -d $INSTALLDIR/bootsplash ]; then
         /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
    else
@@ -216,13 +217,15 @@
   kernel memtest
   append -
 _EOF_
-elif [ $kernel_is_xen ]; then
+elif [ -n $kernel_is_xen ]; then
    if [ -d $INSTALLDIR/bootsplash ]; then
         /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
    else
         echo "Nothing found for bootsplashing."
         nobootsplash
    fi
+/bin/cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz
+/bin/cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/
 /bin/cp $sysdir/boot/initrd-$kernel $csysdir/boot/isolinux/initrd.img
 /bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz
 /bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
@@ -236,11 +239,11 @@
 F4 license.msg
 F5 xen.msg
 label linux
-  kernel vmlinuz
-  append initrd=initrd.img quiet $kernel_params
+  kernel mboot.c32
+  append xen.gz nosmp noacpi --- vmlinuz --- initrd.img quiet $kernel_params
 label debug
-  kernel vmlinuz
-  append initrd=initrd.img INITRD_DBG=x $kernel_params
+  kernel mboot.c32
+  append xen.gz nosmp noacpi noreboot --- vmlinuz --- initrd.img INITRD_DBG=x
 label memtest86
   kernel memtest
   append -




More information about the fedora-extras-commits mailing list