diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-05-05 15:06:15 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-05-05 15:06:15 +0000 |
| commit | b9e34905bc504195c881201ba7b472d65577d735 (patch) | |
| tree | 43017cf1607c5a8c9398647092874b62c64aca3b /scripts/mk-images.i386 | |
| parent | a2ecfaa6df7a71b5b36cb8b1898065b9ef11220a (diff) | |
| download | anaconda-b9e34905bc504195c881201ba7b472d65577d735.tar.gz anaconda-b9e34905bc504195c881201ba7b472d65577d735.tar.xz anaconda-b9e34905bc504195c881201ba7b472d65577d735.zip | |
merge changes from taroon-branch. this merges up to anaconda-9.0.2-1.RHEL
Diffstat (limited to 'scripts/mk-images.i386')
| -rw-r--r-- | scripts/mk-images.i386 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index e556c540a..e2e3993e1 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -25,11 +25,6 @@ prepareBootTree() { cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss rm -f $MBD_BOOTTREE/syslinux-splash.png if [ -d $BOOTDISKDIR/$BOOTLANG ]; then - # fb console and kon don't get along... - if [ "$BOOTLANG" = "ja_JP" ]; then - sed -e "s/ vga=[0-9]*//g" < $MBD_BOOTTREE/syslinux.cfg > $MBD_BOOTTREE/syslinux.cf2 - mv -f $MBD_BOOTTREE/syslinux.cf2 $MBD_BOOTTREE/syslinux.cfg - fi for file in $BOOTDISKDIR/$BOOTLANG/*.msg; do filename=`basename $file` sed -e "s/@VERSION@/$VERSION/g" $file > $MBD_BOOTTREE/$filename @@ -151,7 +146,7 @@ PCMCIAMODULES="$PCMCIAMODULES yenta_socket i82365 tcic pcmcia_core ds" makeBootImages() { echo "Building $TOPDESTPATH/images/pxeboot/initrd.img" makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd.img \ - --pcmcia \ + --pcmcia --nobogl \ --initrdsize 4750 \ --loaderbin loader \ --modules "$COMMONMODULES" |