kadischi/livecd_generator install-boot.sh,1.9,1.10

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	install-boot.sh 
Log Message:
Remove dashes from kernel names, Isolinux doesn't like it.


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- install-boot.sh	30 Jun 2006 23:03:46 -0000	1.9
+++ install-boot.sh	1 Jul 2006 03:20:48 -0000	1.10
@@ -35,14 +35,14 @@
 
 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.smp.img
-        /bin/cp $sysdir/boot/vmlinuz-$kernel_version_proper'smp' $csysdir/boot/isolinux/vmlinuz-smp
+        /bin/cp $sysdir/boot/vmlinuz-$kernel_version_proper'smp' $csysdir/boot/isolinux/vmlinuzsmp
         /bin/cp $sysdir/boot/isolinux/initrd.img $csysdir/boot/isolinux/initrd.img
         /bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz
  
 /bin/cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/
 elif [ -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.smp.img
-        /bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz-smp
+        /bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuzsmp
         /bin/cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/
     if [ -d $INSTALLDIR/bootsplash ]; then
         /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
@@ -51,7 +51,7 @@
         nobootsplash
     fi
 /bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
-default linux-smp
+default linuxsmp
 prompt 1
 display boot.msg
 timeout 600
@@ -59,11 +59,11 @@
 F2 options.msg
 F3 general.msg
 F4 license.msg
-label linux-smp
-  kernel vmlinuz-smp
+label linuxsmp
+  kernel vmlinuzsmp
   append initrd=initrd.smp.img quiet $kernel_params
 label debug
-  kernel vmlinuz-smp
+  kernel vmlinuzsmp
   append initrd=initrd.smp.img INITRD_DBG=x
 label memtest86
   kernel memtest
@@ -109,7 +109,7 @@
             nobootsplash
        fi
 /bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
-default linux-smp
+default linuxsmp
 prompt 1
 display boot.msg 
 timeout 600
@@ -118,7 +118,7 @@
 F3 general.msg
 F4 license.msg
 label linux-smp
-  kernel vmlinuz-smp
+  kernel vmlinuzsmp
   append initrd=initrd.smp.img quiet $kernel_params 
 label linux
   kernel vmlinuz