diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-03-03 15:06:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-03-03 15:06:00 +0000 |
| commit | 36b3a0057f4af19d7935b2edf3243e9dd93eb692 (patch) | |
| tree | 03ca6ad8c859bc49b4c1034c12540d396ecdcd68 /scripts | |
| parent | 2aa2900c378235d58d7c41913448e29931d2bdeb (diff) | |
adjust for memtest86+ changes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mk-images.i386 | 4 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386 index 25d8f0a11..81248cf2e 100644 --- a/scripts/mk-images.i386 +++ b/scripts/mk-images.i386 @@ -201,8 +201,8 @@ makeBootImages() { mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg # copy in memtest if present - if [ -f $IMGPATH/usr/lib/memtest86/memtest86 ]; then - cp $IMGPATH/usr/lib/memtest86/memtest86 $MBD_BOOTTREE/memtest + if [ -f $IMGPATH/boot/memtest86+* ]; then + cp $IMGPATH/boot/memtest86+-* $MBD_BOOTTREE/memtest echo -e "label memtest86\n kernel memtest\n append -\n" >> $MBD_BOOTTREE/isolinux.cfg fi diff --git a/scripts/upd-instroot b/scripts/upd-instroot index a03e4202a..a217fa9b9 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -171,7 +171,7 @@ PACKAGESRESCUE="bzip2 bzip2-libs dump openssh openssh-clients pciutils rsh traceroute tar" if [ $ARCH = i386 ]; then - PACKAGESRESCUE="$PACKAGESRESCUE memtest86" + PACKAGESRESCUE="$PACKAGESRESCUE memtest86+" fi # turn off options we dont want, ie. set package list to something harmless @@ -744,7 +744,7 @@ usr/kerberos/$LIBDIR/libgssapi* usr/kerberos/$LIBDIR/libkrb5* usr/kerberos/$LIBDIR/libk5crypto* usr/kerberos/$LIBDIR/libcom_err* -usr/lib/memtest86/memtest86 +boot/memtest86+-* usr/sbin/mtr usr/sbin/traceroute EOF |