From cb204a6427afc6aaeb7151fadd66e2b238498901 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 28 Sep 2019 22:31:22 +0200 Subject: [PATCH] grub: grub.post: set ZPOOL_VDEV_NAME_PATH=YES Not setting this results in the output of 'zpool status' being misparsed. See https://github.com/zfsonlinux/grub/issues/5 --- srcpkgs/grub/files/kernel.d/grub.post | 2 ++ srcpkgs/grub/template | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/grub/files/kernel.d/grub.post b/srcpkgs/grub/files/kernel.d/grub.post index f28257d999d..561d8b2f179 100644 --- a/srcpkgs/grub/files/kernel.d/grub.post +++ b/srcpkgs/grub/files/kernel.d/grub.post @@ -7,6 +7,8 @@ PKGNAME="$1" VERSION="$2" +export ZPOOL_VDEV_NAME_PATH=YES + if command -v grub-mkconfig >/dev/null 2>&1; then if [ -d $ROOTDIR/boot/grub ]; then grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index cd6b168036d..16f3f5eb01c 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version=2.04 -revision=1 +revision=2 hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf" makedepends="libusb-compat-devel ncurses-devel freetype-devel liblzma-devel device-mapper-devel fuse-devel"