openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installing memtest86+ after file name change in package

Browse Source
This commit is contained in:
Silvan Calarco 2017-03-14 10:47:40 +01:00
parent 12f1a37655
commit f41f89b1ee
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/bootcd/post.inc.sh
View File

@ -46,7 +46,7 @@ label 8
kernel /boot/vmlinuz
append video=vesafb:1024x768-32,ywrap,mtrr root=/dev/sda1 console=tty1 initrd=/boot/initrmfs.gz debug=1 splash=verbose
label 9
kernel memtest
kernel memtest
_EOF
# install isolinux binary
@ -60,7 +60,7 @@ for f in ldlinux.c32 libcom32.c32 libutil.c32 libmenu.c32 menu.c32 vesamenu.c32;
done
# install memtest
[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
{ echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
exit 1; }

4
platforms/bootusb-test/post.inc.sh
View File

@ -47,9 +47,9 @@ LABEL -
MENU DISABLE
_EOF
# rename memtest.bin because syslinux/extlinux consider .bin extension as
# rename memtest86+.bin because syslinux/extlinux consider .bin extension as
# other thing
mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
mv $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR/boot/memtest
# copy /boot directory to final root
cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2

4
platforms/bootusb/post.inc.sh
View File

@ -71,9 +71,9 @@ LABEL -
MENU DISABLE
_EOF
# rename memtest.bin because syslinux/extlinux consider .bin extension as
# rename memtest86+.bin because syslinux/extlinux consider .bin extension as
# other thing
mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
mv $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR/boot/memtest
# copy /boot directory to final root
cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2

2
platforms/installdvd/post.inc.sh
View File

@ -67,7 +67,7 @@ _EOF
cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
# install memtest
[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
{ echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
exit 1; }

4
platforms/livecd/post.inc.sh
View File

@ -108,8 +108,8 @@ for f in ldlinux.c32 libcom32.c32 libutil.c32 libmenu.c32 menu.c32 vesamenu.c32;
done
# install memtest
[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
{ echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
{ echo "Error: /boot/memtest86+.bin not found. Please install the memtest86 package.";
exit 1; }
# copy static files for specific platform

2
platforms/livedvd/post.inc.sh
View File

@ -136,7 +136,7 @@ for f in ldlinux.c32 libcom32.c32 libutil.c32 libmenu.c32 menu.c32 vesamenu.c32;
done
# install memtest
[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
{ echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
exit 1; }

2
platforms/testcd/post.inc.sh
View File

@ -111,7 +111,7 @@ for f in ldlinux.c32 libcom32.c32 libutil.c32 libmenu.c32 menu.c32 vesamenu.c32;
done
# install memtest
[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
{ echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
exit 1; }

2
platforms/testcd/root/boot/grub/grub.cfg
View File

@ -93,7 +93,7 @@ menuentry "Memory test (memtest86+)" {
root=(hd31)
insmod ext2
echo Loading memtest86+ ...
linux16 /boot/memtest.bin
linux16 /boot/memtest86+.bin
}
menuentry "" {