diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | memtest86-efi | 12 |
3 files changed, 12 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = memtest86-efi pkgdesc = A free, thorough, stand alone memory test as an EFI application pkgver = 6.1.0 - pkgrel = 3 + pkgrel = 4 url = http://www.memtest86.com install = memtest86-efi.install arch = i686 @@ -14,7 +14,7 @@ pkgbase = memtest86-efi source = memtest86-efi source = memtest86-efi.conf md5sums = b81b2090c1172cdb238fc3af415522af - md5sums = 78b49495cd332023f5be6644c9e24360 + md5sums = c3b9f65f5ba6f25e3c234cabadd3378c md5sums = 6c096df3f55baf3e27c3bd605a418aa2 pkgname = memtest86-efi @@ -3,7 +3,7 @@ _pkgbasename=memtest86 pkgname=$_pkgbasename-efi pkgver=6.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A free, thorough, stand alone memory test as an EFI application" arch=('i686' 'x86_64') url="http://www.memtest86.com" @@ -15,7 +15,7 @@ source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_ "memtest86-efi" "memtest86-efi.conf") md5sums=('b81b2090c1172cdb238fc3af415522af' - '78b49495cd332023f5be6644c9e24360' + 'c3b9f65f5ba6f25e3c234cabadd3378c' '6c096df3f55baf3e27c3bd605a418aa2') prepare() { diff --git a/memtest86-efi b/memtest86-efi index a672d81343fa..e8faae7e6089 100644 --- a/memtest86-efi +++ b/memtest86-efi @@ -25,7 +25,7 @@ install() { echo "Please, how do you want to use $0 ?" echo -e "\033[1m1\033[0m: From \033[1mLaunch EFI Shell\033[0m (in UEFI Setup), e.g. as shellx64.efi on ESP's root (bit safe)" echo -e "\033[1m2\033[0m: Add a new boot entry (more safe)" - echo -e "\033[1m3\033[0m: Add a file for GRUB2 (untested)" + echo -e "\033[1m3\033[0m: Add a file for GRUB2" echo -e "\033[1m4: Cancel\033[0m" choice=0; while [[ $choice < 1 ]] || [[ $choice > 4 ]]; do read choice @@ -57,9 +57,13 @@ install() { cp -v "$MEMTEST86_PATH/"* "$esp/EFI/memtest86/" # Move files in memtest ESP directory mv -v "$esp/EFI/memtest86/boot$ARCH.efi" "$esp/EFI/memtest86/memtest$ARCH.efi" # Rename .efi file echo -e "\nAdd a new configuration file for GRUB..." - echo "menuentry \"Memtest86\" { - search --set=root --no-floppy --fs-uuid $(blkid $partition -s UUID -o value) - chainloader /EFI/memtest86/memtest$ARCH.efi" > "/etc/grub.d/86_memtest" + echo -e "if [ \"\${grub_platform}\" == \"efi\" ]; then + \tmenuentry \"Memtest86\" { + \tsearch --set=root --no-floppy --fs-uuid $(blkid $partition -s UUID -o value) + \tchainloader /EFI/memtest86/memtest$ARCH.efi + \t} + fi" > "/etc/grub.d/86_memtest" + chmod +x "/etc/grub.d/86_memtest" grub-mkconfig -o "/boot/grub/grub.cfg" elif [[ $choice == 4 ]]; then # Do nothing and quit |