diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-05-07 19:08:33 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-05-07 19:08:33 +0000 |
| commit | 8e7627dae2a0ea44acfdc6e479f8375767ee3d1c (patch) | |
| tree | c724f66468b1a7ad9301e13b5612ab509fd063b4 | |
| parent | c9e2d6b49375de11b8d9e948f27eddc8719a87f0 (diff) | |
| download | anaconda-8e7627dae2a0ea44acfdc6e479f8375767ee3d1c.tar.gz anaconda-8e7627dae2a0ea44acfdc6e479f8375767ee3d1c.tar.xz anaconda-8e7627dae2a0ea44acfdc6e479f8375767ee3d1c.zip | |
merge memtest fixes from -HEAD
| -rw-r--r-- | scripts/mk-images.i386 | 5 | ||||
| -rw-r--r-- | scripts/mk-images.x86_64 | 7 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 5ae96a48d..0e24e8f68 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -29,6 +29,7 @@ prepareBootTree() { pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss rm -f $MBD_BOOTTREE/syslinux-splash.png + rm -f $MBD_BOOTTREE/memtest* for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` sed -e "s/@VERSION@/$VERSION/g" $file > $MBD_BOOTTREE/$filename @@ -173,8 +174,8 @@ makeBootImages() { mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg # copy in memtest if present - if [ -f $IMGPATH/boot/memtest86+* ]; then - cp $IMGPATH/boot/memtest86+-* $MBD_BOOTTREE/memtest + 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 fi diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64 index 1de03bef6..38ebcc63e 100644 --- a/scripts/mk-images.x86_64 +++ b/scripts/mk-images.x86_64 @@ -19,6 +19,7 @@ prepareBootTree() { pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss rm -f $MBD_BOOTTREE/syslinux-splash.png + rm -f $MBD_BOOTTREE/memtest* for file in $BOOTDISKDIR/*.msg; do filename=`basename $file` sed -e "s/@VERSION@/$VERSION/g" $file > $MBD_BOOTTREE/$filename @@ -107,6 +108,12 @@ makeBootImages() { # isolinux needs the config file to be isolinux.cfg mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg + + # 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 + fi else echo "No isolinux binaries. Skipping isolinux creation" fi diff --git a/scripts/upd-instroot b/scripts/upd-instroot index a3870f0ca..f554d16ab 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -986,6 +986,14 @@ for p in $DEST $DESTGR; do cp -af $p/boot/efi/EFI/redhat//* $p/usr/lib/anaconda-runtime/boot fi + # copy bootloader files for i386/x86_64 + if [ $ARCH = i386 -o $ARCH = x86_64 ]; then + if [ $p = $DESTGR ]; then + mkdir -p $p/usr/lib/anaconda-runtime/boot + cp -af $p/boot/memtest* $p/usr/lib/anaconda-runtime/boot + fi + fi + rm -rf $p/boot $p/home $p/root $p/tmp find $p -name "*.a" | grep -v "usr/X11R6/$LIBDIR/modules" | xargs rm -rf |