Fix install path of zpool.d scripts

diff --git a/debian/patches/0010-fix-install-path-of-zpool.d-scripts.patch b/debian/patches/0010-fix-install-path-of-zpool.d-scripts.patch
new file mode 100644 (file)
index 0000000..0fdc573
--- /dev/null
+++ b/debian/patches/0010-fix-install-path-of-zpool.d-scripts.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Thu, 12 Oct 2017 08:57:48 +0200
+Subject: fix install path of zpool.d scripts
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ cmd/zpool/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
+index 6eff1d1..872a223 100644
+--- a/cmd/zpool/Makefile.am
++++ b/cmd/zpool/Makefile.am
+@@ -22,11 +22,11 @@ zpool_LDADD = \
+       -lm $(LIBBLKID)
+ 
+ zpoolconfdir = $(sysconfdir)/zfs/zpool.d
+-zpoolexecdir = $(libexecdir)/zfs/zpool.d
++zpoollibdir = /usr/lib/zfs-linux/zpool.d
+ 
+ EXTRA_DIST = zpool.d/README
+ 
+-dist_zpoolexec_SCRIPTS = \
++dist_zpoollib_SCRIPTS = \
+       zpool.d/enc \
+       zpool.d/encdev \
+       zpool.d/fault_led \
+@@ -107,5 +107,5 @@ install-data-hook:
+       for f in $(zpoolconfdefaults); do \
+         test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
+              -L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
+-          ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
++          ln -s "$(zpoollibdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
+       done

diff --git a/debian/patches/series b/debian/patches/series
index b5e68c829171babbe37683cfff5fdcf582b80574..d6f6f87f925089e691d551d9529924e4624c43d2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ enable-zed.patch
 1004-zed-service-bindir.patch
 0008-dracut-make-module-setup.sh-shebang-explicit.patch
 0009-add-man-page-reference-to-systemd-units.patch
+0010-fix-install-path-of-zpool.d-scripts.patch

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index ec3fc16e063e9df2571257eb150f07476559a920..b355ec47e4248fba20262dfed3b9160d284af918 100644 (file)
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -10,7 +10,7 @@ lib/udev/
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
-usr/lib/*/zfs/zpool.d/
+usr/lib/zfs-linux/zpool.d/
 sbin/fsck.zfs
 sbin/mount.zfs
 sbin/ztest