From 43e2847cd5c6bd847a894b910a0b9a35e2dc65df Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 9 Aug 2006 01:51:35 +0000 Subject: 2006-08-08 Jeremy Katz Patch from Paul Schroder for nogr mode * scripts/buildinstall: Add --nogr option * scripts/mk-images: Use --nogr * scripts/mk-images.x86: Only put splash image in if building a graphics stage2 * scripts/upd-instroot: Cleanups for --nogr --- scripts/mk-images.x86 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'scripts/mk-images.x86') diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 822e56961..8063db36e 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -12,17 +12,21 @@ fi # prepare a directory with the kernel, initrd, and various message files # used to populate a boot image prepareBootTree() { - (cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE) + (cd $BOOTDISKDIR; find . -maxdepth 1 ! -name "*.msg" ! -type d | cpio --quiet -p $MBD_BOOTTREE) cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz - $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 [ -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 + fi + rm -f $MBD_BOOTTREE/memtest* for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` -- cgit