diff options
author | Xorg | 2017-09-04 11:25:17 +0200 |
---|---|---|
committer | Xorg | 2017-09-04 11:25:32 +0200 |
commit | c1d588a7305a5f9b365f515bfc69690a7ea056b2 (patch) | |
tree | b8cb07a737b974fb84ba9ab3571184f93a9fe8b1 | |
parent | b7b5bd892484b09b7bdcd68099727aa838ea2dca (diff) | |
download | aur-c1d588a7305a5f9b365f515bfc69690a7ea056b2.tar.gz |
Fix efibootmgr command with NVMe device in memtest86-efi script again
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | memtest86-efi | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Sep 4 08:15:40 UTC 2017 +# Mon Sep 4 09:25:31 UTC 2017 pkgbase = memtest86-efi pkgdesc = A free, thorough, stand alone memory test as an EFI application pkgver = 7.4 - pkgrel = 2 + pkgrel = 3 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 = d375869c4413b0745b33d2c48e76cc09 + md5sums = 9d970ce33ec9633fc823916faf614b61 md5sums = 6c096df3f55baf3e27c3bd605a418aa2 md5sums = 8b4aa0e2f5d769d902459c8f8d514336 md5sums = 496120c33c2af986933bf33456fa6cf3 @@ -3,7 +3,7 @@ _pkgbasename=memtest86 pkgname=$_pkgbasename-efi pkgver=7.4 -pkgrel=2 +pkgrel=3 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' - 'd375869c4413b0745b33d2c48e76cc09' + '9d970ce33ec9633fc823916faf614b61' '6c096df3f55baf3e27c3bd605a418aa2' '8b4aa0e2f5d769d902459c8f8d514336' '496120c33c2af986933bf33456fa6cf3' diff --git a/memtest86-efi b/memtest86-efi index 8d1836521874..7889ce39f0b8 100644 --- a/memtest86-efi +++ b/memtest86-efi @@ -51,7 +51,8 @@ install() { echo -en "else enter device path manually (like ${CB}/dev/sdXY${CR}): " read choice [[ -n $choice ]] && partition=$choice - partnumber=${partition//[^0-9]/} + partnumber=$(echo $partition | grep -Eo '[0-9]+$') + [[ $partition == "/dev/nvme"* ]] && device=$(echo $partition | cut -dp -f1) || device=${partition//$partnumber} # Find ESP mount point esp=$(mount | grep $partition | awk '{print $3}' | tail -n1) @@ -96,7 +97,7 @@ install() { checkcommand efibootmgr _common_install echo -e "\nAdd a new EFI boot entry..." - efibootmgr -c -d ${partition//$partnumber} -p ${partnumber} -w -L "MemTest86" -l "\EFI\memtest86\memtest$ARCH.efi" # Manage efi entry + efibootmgr -c -d ${device} -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 |