diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-01-18 16:12:24 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-01-18 16:12:24 +0000 |
| commit | 24d01808a35b3f827223602559e3731e854fae45 (patch) | |
| tree | 435f62b3d18e7f8c56d9ac28dea1d48c16f0be59 /scripts | |
| parent | f97016cfc982494ab2362bd0e530e2427622726f (diff) | |
| download | anaconda-24d01808a35b3f827223602559e3731e854fae45.tar.gz anaconda-24d01808a35b3f827223602559e3731e854fae45.tar.xz anaconda-24d01808a35b3f827223602559e3731e854fae45.zip | |
2007-01-18 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images.x86 (SYSLINUX): Handle doing any of vesamenu
with a jpg, using the script to convert to the lss file or just
having the lss file.
* bootdisk/i386/syslinux.cfg: Add bits so that we can support a
menu if desired
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mk-images.x86 | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 1afdffb9b..931e94662 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -18,15 +18,26 @@ prepareBootTree() { cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz if [ -n "$NEEDGR" ]; then - $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh $BOOTDISKDIR/syslinux-splash.png $BOOTDISKDIR/splash.lss - if [ $? != 0 ]; then - echo $0: Failed to create splash.lss - exit 1 - fi - cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss - rm -f $MBD_BOOTTREE/syslinux-splash.png + if [ -f $IMGPATH/usr/lib/anaconda-runtime/splash.jpg ]; then + cp $IMGPATH/usr/lib/anaconda-runtime/splash.jpg $MBD_BOOTTREE/splash.jpg + cp $IMGPATH/usr/lib/syslinux/vesamenu.c32 $MBD_BOOTTREE/vesamenu.c32 + sed -ie s'/default linux/default vesamenu.c32/g' $MBD_BOOTTREE/syslinux.cfg + sed -ie 's/prompt 1/#prompt 1/g' $MBD_BOOTTREE/syslinux.cfg + elif [ -x $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh ]; then + $IMGPATH/usr/lib/anaconda-runtime/splashtolss.sh $BOOTDISKDIR/syslinux-splash.png $BOOTDISKDIR/splash.lss + if [ $? != 0 ]; then + echo $0: Failed to create splash.lss + exit 1 + fi + cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss + rm -f $MBD_BOOTTREE/syslinux-splash.png + elif [ -f $IMGPATH/usr/lib/anaconda-runtime/splash.lss ]; then + cp $IMGPATH/usr/lib/anaconda-runtime/splash.lss $MBD_BOOTTREE/splash.lss + fi fi + sed -ie "s/@PRODUCT@/$PRODUCT/g" $MBD_BOOTTREE/syslinux.cfg + rm -f $MBD_BOOTTREE/memtest* for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` @@ -82,7 +93,7 @@ makeBootImages() { # copy in memtest if present if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then cp $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* $MBD_BOOTTREE/memtest - echo -e "label memtest86\n kernel memtest\n append -\n" >> $MBD_BOOTTREE/isolinux.cfg + echo -e "label memtest86\n menu label ^Memory test\n kernel memtest\n append -\n" >> $MBD_BOOTTREE/isolinux.cfg fi else echo "No isolinux binaries. Skipping isolinux creation" |