71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From 0621f2d155fcf7b12498e39fdb0867748ce8c626 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
Date: Thu, 12 Oct 2017 09:01:08 +0200
|
|
Subject: [PATCH 07/11] 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>
|
|
---
|
|
.../0010-fix-install-path-of-zpool.d-scripts.patch | 37 ++++++++++++++++++++++
|
|
debian/patches/series | 1 +
|
|
2 files changed, 38 insertions(+)
|
|
create mode 100644 debian/patches/0010-fix-install-path-of-zpool.d-scripts.patch
|
|
|
|
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
|
|
index 000000000..8fc81b144
|
|
--- /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 b5e68c829..d6f6f87f9 100644
|
|
--- 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
|
|
--
|
|
2.14.1
|
|
|