[pve-devel] [PATCH grub 2/4] add fix for ZFS vdev path bug

[Fabian Grünbichler]

---
Note: forwarded to Debian as well in bugs #824974 and #841021

 pvepatches/series                       |  1 +
 pvepatches/zpool_full_device_name.patch | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pvepatches/zpool_full_device_name.patch

diff --git a/pvepatches/series b/pvepatches/series
index 21be043..3d58a80 100644
--- a/pvepatches/series
+++ b/pvepatches/series
@@ -16,3 +16,4 @@ suggest-os-prober.patch
 #grub-disable-os-prober.patch
 #grub-disable-recovery.patch
 fix-default-grub-config.patch
+zpool_full_device_name.patch
diff --git a/pvepatches/zpool_full_device_name.patch b/pvepatches/zpool_full_device_name.patch
new file mode 100644
index 0000000..6d2d51a
--- /dev/null
+++ b/pvepatches/zpool_full_device_name.patch
@@ -0,0 +1,19 @@
+Description: zfs-initramfs currently provides extraneous, undesired symlinks to
+  devices directly underneath /dev/ to satisfy zpool's historical output of
+  unqualified device names. By including this environment variable to signal
+  our intent to zpool, zfs-linux packages can drop the symlink behavior when
+  updating to its upstream or backported output behavior.
+Author: Chad MILLER <chad.miller at canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1527727
+Bug: https://savannah.gnu.org/bugs/?43653
+
+--- a/grub-core/osdep/unix/getroot.c
++++ b/grub-core/osdep/unix/getroot.c
+@@ -243,6 +243,7 @@ grub_util_find_root_devices_from_poolnam
+   argv[2] = poolname;
+   argv[3] = NULL;
+ 
++  setenv("ZPOOL_VDEV_NAME_PATH", "YES", 1);
+   pid = grub_util_exec_pipe (argv, &fd);
+   if (!pid)
+     return NULL;
-- 
2.1.4