diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-08-09 01:51:35 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-08-09 01:51:35 +0000 |
| commit | 43e2847cd5c6bd847a894b910a0b9a35e2dc65df (patch) | |
| tree | f39aa142c1dfe8a85be4c5dd4a1bd9be7a5d16bc /scripts/mk-images.x86 | |
| parent | 9bc57275e7e3af2c10a5b42940c775b3ba8a0d21 (diff) | |
| download | anaconda-43e2847cd5c6bd847a894b910a0b9a35e2dc65df.tar.gz anaconda-43e2847cd5c6bd847a894b910a0b9a35e2dc65df.tar.xz anaconda-43e2847cd5c6bd847a894b910a0b9a35e2dc65df.zip | |
2006-08-08 Jeremy Katz <katzj@redhat.com>
Patch from Paul Schroder <pschroeder@uplogix.com> 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
Diffstat (limited to 'scripts/mk-images.x86')
| -rw-r--r-- | scripts/mk-images.x86 | 20 |
1 files changed, 12 insertions, 8 deletions
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` |