[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.7-2-20-gd10c42c

[Carlos Alberto Lopez Perez]

The following commit has been merged in the master branch:
commit f39f1f07fbb93efacd89555b3e7dc80753b52ffc
Author: Carlos Alberto Lopez Perez <clopez at igalia.com>
Date:   Thu Jan 5 16:28:25 2017 +0100

    Fix path to zed binary in systemd service unit

diff --git a/debian/patches/1004-zed-service-bindir.patch b/debian/patches/1004-zed-service-bindir.patch
new file mode 100644
index 0000000..6cbe08e
--- /dev/null
+++ b/debian/patches/1004-zed-service-bindir.patch
@@ -0,0 +1,19 @@
+Description: Fix the path to the zed binary on the systemd unit.
+ We install zed into /usr/sbin manually meanwhile the upstream default
+ is installing it into /sbin.
+ Ubuntu packages also install zed to /usr/sbin, but they ship their own
+ zfs-zed unit.
+Author: Carlos Alberto Lopez <clopez at igalia.com>
+Debian-Bug: https://bugs.debian.org/849813
+Forwarded: no
+--- a/etc/systemd/system/zfs-zed.service.in
++++ b/etc/systemd/system/zfs-zed.service.in
+@@ -5,7 +5,7 @@ After=zfs-import-cache.service
+ After=zfs-import-scan.service
+ 
+ [Service]
+-ExecStart=@sbindir@/zed -F
++ExecStart=@bindir@/zed -F
+ Restart=on-abort
+ 
+ [Install]
diff --git a/debian/patches/series b/debian/patches/series
index 086d2b0..af018e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 enable-zed.patch
 1001-cmd-python-exec-path.patch
 1003-linux-4.9-compat.patch
+1004-zed-service-bindir.patch

-- 
OpenZFS on Linux