Commit f41f89b1eeb7c4970b235f883ad86569a688e907

Authored by Silvan Calarco
1 parent 12f1a37655
Exists in master

Fix installing memtest86+ after file name change in package

Showing 8 changed files with 12 additions and 12 deletions Side-by-side Diff

platforms/bootcd/post.inc.sh
... ... @@ -46,7 +46,7 @@
46 46 kernel /boot/vmlinuz
47 47 append video=vesafb:1024x768-32,ywrap,mtrr root=/dev/sda1 console=tty1 initrd=/boot/initrmfs.gz debug=1 splash=verbose
48 48 label 9
49   - kernel memtest
  49 + kernel memtest
50 50 _EOF
51 51  
52 52 # install isolinux binary
... ... @@ -60,7 +60,7 @@
60 60 done
61 61  
62 62 # install memtest
63   -[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
  63 +[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
64 64 { echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
65 65 exit 1; }
66 66  
platforms/bootusb-test/post.inc.sh
... ... @@ -47,9 +47,9 @@
47 47 MENU DISABLE
48 48 _EOF
49 49  
50   -# rename memtest.bin because syslinux/extlinux consider .bin extension as
  50 +# rename memtest86+.bin because syslinux/extlinux consider .bin extension as
51 51 # other thing
52   -mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
  52 +mv $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR/boot/memtest
53 53  
54 54 # copy /boot directory to final root
55 55 cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2
platforms/bootusb/post.inc.sh
... ... @@ -71,9 +71,9 @@
71 71 MENU DISABLE
72 72 _EOF
73 73  
74   -# rename memtest.bin because syslinux/extlinux consider .bin extension as
  74 +# rename memtest86+.bin because syslinux/extlinux consider .bin extension as
75 75 # other thing
76   -mv $MOUNTDIR/boot/memtest.bin $MOUNTDIR/boot/memtest
  76 +mv $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR/boot/memtest
77 77  
78 78 # copy /boot directory to final root
79 79 cp -a --no-preserve=ownership $MOUNTDIR/boot $MOUNTDIR2
platforms/installdvd/post.inc.sh
... ... @@ -67,7 +67,7 @@
67 67 cp $MOUNTDIR/usr/share/syslinux/vesamenu.c32 $MOUNTDIR2/boot/isolinux/
68 68  
69 69 # install memtest
70   -[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
  70 +[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
71 71 { echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
72 72 exit 1; }
73 73  
platforms/livecd/post.inc.sh
... ... @@ -108,8 +108,8 @@
108 108 done
109 109  
110 110 # install memtest
111   -[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
112   - { echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
  111 +[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
  112 + { echo "Error: /boot/memtest86+.bin not found. Please install the memtest86 package.";
113 113 exit 1; }
114 114  
115 115 # copy static files for specific platform
platforms/livedvd/post.inc.sh
... ... @@ -136,7 +136,7 @@
136 136 done
137 137  
138 138 # install memtest
139   -[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
  139 +[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
140 140 { echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
141 141 exit 1; }
142 142  
platforms/testcd/post.inc.sh
... ... @@ -111,7 +111,7 @@
111 111 done
112 112  
113 113 # install memtest
114   -[ -e $MOUNTDIR/boot/memtest.bin ] && cp $MOUNTDIR/boot/memtest.bin $MOUNTDIR2/boot/isolinux/memtest ||
  114 +[ -e $MOUNTDIR/boot/memtest86+.bin ] && cp $MOUNTDIR/boot/memtest86+.bin $MOUNTDIR2/boot/isolinux/memtest ||
115 115 { echo "Error: /boot/memtest.bin not found. Please install the memtest86 package.";
116 116 exit 1; }
117 117  
platforms/testcd/root/boot/grub/grub.cfg
... ... @@ -93,7 +93,7 @@
93 93 root=(hd31)
94 94 insmod ext2
95 95 echo Loading memtest86+ ...
96   - linux16 /boot/memtest.bin
  96 + linux16 /boot/memtest86+.bin
97 97 }
98 98  
99 99 menuentry "" {