summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXorg2017-09-04 10:15:27 +0200
committerXorg2017-09-04 10:16:10 +0200
commitb7b5bd892484b09b7bdcd68099727aa838ea2dca (patch)
tree67a9899b529c816195f5578e20fb2501178f32d0
parentc43e7f7b887879f543b5b6806e9a5d8d386036e4 (diff)
downloadaur-b7b5bd892484b09b7bdcd68099727aa838ea2dca.tar.gz
Fix efibootmgr command with NVMe device in memtest86-efi script
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--memtest86-efi3
3 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7bcc168be44a..1ed9a73db6d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jul 28 11:28:49 UTC 2017
+# Mon Sep 4 08:15:40 UTC 2017
pkgbase = memtest86-efi
pkgdesc = A free, thorough, stand alone memory test as an EFI application
pkgver = 7.4
- pkgrel = 1
+ pkgrel = 2
url = http://www.memtest86.com
install = memtest86-efi.install
arch = i686
@@ -22,7 +22,7 @@ pkgbase = memtest86-efi
source = memtest86-efi-update.hook
source = memtest86-efi-remove.hook
md5sums = 1719171a1d84d6b183112568cbdf8d61
- md5sums = 5dc6005ffd904163c40ceb06e68a467b
+ md5sums = d375869c4413b0745b33d2c48e76cc09
md5sums = 6c096df3f55baf3e27c3bd605a418aa2
md5sums = 8b4aa0e2f5d769d902459c8f8d514336
md5sums = 496120c33c2af986933bf33456fa6cf3
diff --git a/PKGBUILD b/PKGBUILD
index 050dbbe2c5ef..11eb2cda677f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgbasename=memtest86
pkgname=$_pkgbasename-efi
pkgver=7.4
-pkgrel=1
+pkgrel=2
pkgdesc="A free, thorough, stand alone memory test as an EFI application"
arch=('i686' 'x86_64')
url="http://www.memtest86.com"
@@ -21,7 +21,7 @@ source=("$_pkgbasename-$pkgver.iso.tar.gz::http://www.memtest86.com/downloads/$_
"memtest86-efi-update.hook"
"memtest86-efi-remove.hook")
md5sums=('1719171a1d84d6b183112568cbdf8d61'
- '5dc6005ffd904163c40ceb06e68a467b'
+ 'd375869c4413b0745b33d2c48e76cc09'
'6c096df3f55baf3e27c3bd605a418aa2'
'8b4aa0e2f5d769d902459c8f8d514336'
'496120c33c2af986933bf33456fa6cf3'
diff --git a/memtest86-efi b/memtest86-efi
index cb790781e8da..8d1836521874 100644
--- a/memtest86-efi
+++ b/memtest86-efi
@@ -51,6 +51,7 @@ install() {
echo -en "else enter device path manually (like ${CB}/dev/sdXY${CR}): "
read choice
[[ -n $choice ]] && partition=$choice
+ partnumber=${partition//[^0-9]/}
# Find ESP mount point
esp=$(mount | grep $partition | awk '{print $3}' | tail -n1)
@@ -95,7 +96,7 @@ install() {
checkcommand efibootmgr
_common_install
echo -e "\nAdd a new EFI boot entry..."
- efibootmgr -c -d ${partition:0:8} -p ${partition:8} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry
+ efibootmgr -c -d ${partition//$partnumber} -p ${partnumber} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry
;;
3) # Install MemTest86 in $esp/EFI/memtest86/ & add a file for GRUB2