diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog --- grub2-2.02~beta2/debian/changelog 2016-02-05 10:41:06.000000000 -0500 +++ grub2-2.02~beta2/debian/changelog 2016-02-26 11:21:58.000000000 -0500 @@ -1,3 +1,10 @@ +grub2 (2.02~beta2-36ubuntu1) xenial; urgency=medium + + * debian/patches/zpool_full_device_name.patch: Signal to zpool that + it should emit full names of constituent devices. + + -- Chad MILLER Fri, 26 Feb 2016 11:21:51 -0500 + grub2 (2.02~beta2-36) unstable; urgency=medium [ Colin Watson ] diff -Nru grub2-2.02~beta2/debian/patches/series grub2-2.02~beta2/debian/patches/series --- grub2-2.02~beta2/debian/patches/series 2016-01-22 06:00:23.000000000 -0500 +++ grub2-2.02~beta2/debian/patches/series 2016-02-26 10:56:08.000000000 -0500 @@ -97,3 +97,4 @@ zfs-zap-lookup-truncation.patch zfs-extensible-dataset-large-blocks.patch 0099-Work-around-unsupported-relocations-on-arm64.patch +zpool_full_device_name.patch diff -Nru grub2-2.02~beta2/debian/patches/zpool_full_device_name.patch grub2-2.02~beta2/debian/patches/zpool_full_device_name.patch --- grub2-2.02~beta2/debian/patches/zpool_full_device_name.patch 1969-12-31 19:00:00.000000000 -0500 +++ grub2-2.02~beta2/debian/patches/zpool_full_device_name.patch 2016-02-26 11:18:11.000000000 -0500 @@ -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 +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;