From 4d64ad41432128c19fd851f4cd376d984ec666b6 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Fri, 7 May 2004 18:31:50 +0000
Subject: more trying to fix memtest86+

---
 scripts/mk-images.i386   | 2 +-
 scripts/mk-images.x86_64 | 6 ++++++
 scripts/upd-instroot     | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 5ae96a48d..a9f376762 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -174,7 +174,7 @@ makeBootImages() {
 
 	# copy in memtest if present
 	if [ -f $IMGPATH/boot/memtest86+* ]; then
-           cp $IMGPATH/boot/memtest86+-* $MBD_BOOTTREE/memtest
+           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..d01d42b99 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -107,6 +107,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/boot/memtest86+* ]; 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
-- 
cgit