[pve-devel] [PATCH zfsonlinux 1/6] update submodule and patches for zfs-0.8.4

[Stoiko Ivanov]

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 .../0004-import-with-d-dev-disk-by-id-in-scan-service.patch   | 4 ++--
 upstream                                                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
index e1f3360c..4ad0db30 100644
--- a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
+++ b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
  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 4aae9f06e..ec5c45e63 100644
+index 278f937fe..e8c502a33 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -11,7 +11,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
  [Service]
  Type=oneshot
  RemainAfterExit=yes
diff --git a/upstream b/upstream
index 9bb3d57b..6b18d7df 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 9bb3d57b03e6916a2d38574420a2934b8827b3fb
+Subproject commit 6b18d7df3772cffa6469b00866d7eae585b912ae
-- 
2.20.1