zfs-patches/0007-fix-install-path-of-zpool.d-scripts.patch

   1 From 0621f2d155fcf7b12498e39fdb0867748ce8c626 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
   3 Date: Thu, 12 Oct 2017 09:01:08 +0200
   4 Subject: [PATCH 07/11] fix install path of zpool.d scripts
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  10 ---
  11  .../0010-fix-install-path-of-zpool.d-scripts.patch | 37 ++++++++++++++++++++++
  12  debian/patches/series                              |  1 +
  13  2 files changed, 38 insertions(+)
  14  create mode 100644 debian/patches/0010-fix-install-path-of-zpool.d-scripts.patch
  15
  16 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
  17 new file mode 100644
  18 index 000000000..8fc81b144
  19 --- /dev/null
  20 +++ b/debian/patches/0010-fix-install-path-of-zpool.d-scripts.patch
  21 @@ -0,0 +1,37 @@
  22 +From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
  23 +Date: Thu, 12 Oct 2017 08:57:48 +0200
  24 +Subject: fix install path of zpool.d scripts
  25 +MIME-Version: 1.0
  26 +Content-Type: text/plain; charset="utf-8"
  27 +Content-Transfer-Encoding: 8bit
  28 +
  29 +Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  30 +---
  31 + cmd/zpool/Makefile.am | 6 +++---
  32 + 1 file changed, 3 insertions(+), 3 deletions(-)
  33 +
  34 +diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
  35 +index 6eff1d1..872a223 100644
  36 +--- a/cmd/zpool/Makefile.am
  37 ++++ b/cmd/zpool/Makefile.am
  38 +@@ -22,11 +22,11 @@ zpool_LDADD = \
  39 +       -lm $(LIBBLKID)
  40 +
  41 + zpoolconfdir = $(sysconfdir)/zfs/zpool.d
  42 +-zpoolexecdir = $(libexecdir)/zfs/zpool.d
  43 ++zpoollibdir = /usr/lib/zfs-linux/zpool.d
  44 +
  45 + EXTRA_DIST = zpool.d/README
  46 +
  47 +-dist_zpoolexec_SCRIPTS = \
  48 ++dist_zpoollib_SCRIPTS = \
  49 +       zpool.d/enc \
  50 +       zpool.d/encdev \
  51 +       zpool.d/fault_led \
  52 +@@ -107,5 +107,5 @@ install-data-hook:
  53 +       for f in $(zpoolconfdefaults); do \
  54 +         test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
  55 +              -L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
  56 +-          ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
  57 ++          ln -s "$(zpoollibdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
  58 +       done
  59 diff --git a/debian/patches/series b/debian/patches/series
  60 index b5e68c829..d6f6f87f9 100644
  61 --- a/debian/patches/series
  62 +++ b/debian/patches/series
  63 @@ -6,3 +6,4 @@ enable-zed.patch
  64  1004-zed-service-bindir.patch
  65  0008-dracut-make-module-setup.sh-shebang-explicit.patch
  66  0009-add-man-page-reference-to-systemd-units.patch
  67 +0010-fix-install-path-of-zpool.d-scripts.patch
  68 --
  69 2.14.1
  70