diff -Nru zfs-linux-0.6.5.4/debian/changelog zfs-linux-0.6.5.4/debian/changelog --- zfs-linux-0.6.5.4/debian/changelog 2016-02-10 05:48:07.000000000 -0500 +++ zfs-linux-0.6.5.4/debian/changelog 2016-02-16 11:05:43.000000000 -0500 @@ -1,3 +1,11 @@ +zfs-linux (0.6.5.4-0ubuntu3) UNRELEASED; urgency=medium + + * debian/patches/zpool-device-full-paths-envvar: Make "zpool status" emit + full device names if "WITH_FULL_PATHS" environment variable is set to nonzero. + (LP: #1527727) + + -- Chad MILLER Tue, 16 Feb 2016 10:36:36 -0500 + zfs-linux (0.6.5.4-0ubuntu2) xenial; urgency=medium [ Colin Ian King ] diff -Nru zfs-linux-0.6.5.4/debian/patches/series zfs-linux-0.6.5.4/debian/patches/series --- zfs-linux-0.6.5.4/debian/patches/series 2016-02-08 10:11:37.000000000 -0500 +++ zfs-linux-0.6.5.4/debian/patches/series 2016-02-16 10:35:51.000000000 -0500 @@ -4,3 +4,4 @@ 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch 1000-ppc64el-endian-support.patch 1001-shift-param.h-include-order-to-avoid-header-loop-on-arm64.patch +zpool-device-full-paths-envvar diff -Nru zfs-linux-0.6.5.4/debian/patches/zpool-device-full-paths-envvar zfs-linux-0.6.5.4/debian/patches/zpool-device-full-paths-envvar --- zfs-linux-0.6.5.4/debian/patches/zpool-device-full-paths-envvar 1969-12-31 19:00:00.000000000 -0500 +++ zfs-linux-0.6.5.4/debian/patches/zpool-device-full-paths-envvar 2016-02-16 11:06:05.000000000 -0500 @@ -0,0 +1,20 @@ +Description: Make "zpool status" emit full device names if "WITH_FULL_PATHS" + environment variable is set to nonzero. +Author: Chad MILLER +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1527727 +Forwarded: no + +--- zfs-linux-0.6.5.4.orig/lib/libzfs/libzfs_pool.c ++++ zfs-linux-0.6.5.4/lib/libzfs/libzfs_pool.c +@@ -3484,8 +3484,11 @@ zpool_vdev_name(libzfs_handle_t *hdl, zp + */ + verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_TYPE, &type) == 0); + if (strcmp(type, VDEV_TYPE_DISK) == 0) { ++ char *full_paths = getenv("WITH_FULL_PATHS"); ++ if ((full_paths == NULL) || (strcmp(full_paths, "") == 0) || (strcmp(full_paths, "0") == 0)) { + path = strrchr(path, '/'); + path++; ++ } + } + + /*