[pve-devel] applied: [PATCH zfsonlinux 1/2] import with '-d /dev/disk/by-id' in systemd service

[Fabian Grünbichler]

---
this reverts back to the previous behaviour, and prevents boot errors
like described in https://forum.proxmox.com/threads/failed-to-import-pool-rpool.29942/

 zfs-patches/import-by-disk-id.patch | 25 +++++++++++++++++++++++++
 zfs-patches/series                  |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 zfs-patches/import-by-disk-id.patch

diff --git a/zfs-patches/import-by-disk-id.patch b/zfs-patches/import-by-disk-id.patch
new file mode 100644
index 0000000..58c6bbe
--- /dev/null
+++ b/zfs-patches/import-by-disk-id.patch
@@ -0,0 +1,25 @@
+From eb964a8215c04df7dd42f00c66618593db49c672 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Mon, 24 Oct 2016 13:47:06 +0200
+Subject: [PATCH] import with -d /dev/disk/by-id in scan service
+
+---
+ etc/systemd/system/zfs-import-scan.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
+index 0105283..665b9c8 100644
+--- a/etc/systemd/system/zfs-import-scan.service.in
++++ b/etc/systemd/system/zfs-import-scan.service.in
+@@ -10,7 +10,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+ Type=oneshot
+ RemainAfterExit=yes
+ ExecStartPre=/sbin/modprobe zfs
+-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
+ 
+ [Install]
+ WantedBy=zfs-mount.service
+-- 
+2.1.4
+
diff --git a/zfs-patches/series b/zfs-patches/series
index 87faa8d..1727f18 100644
--- a/zfs-patches/series
+++ b/zfs-patches/series
@@ -1,3 +1,4 @@
 fix-control.patch
 add-zfsutils-preinst-postinst.patch
 fix-dependencies-for-upgrades.patch
+import-by-disk-id.patch
-- 
2.1.4