00430d087a
rebase done with import-patchqueue/export-patchqueue Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
|
|
Date: Thu, 12 Oct 2017 08:57:48 +0200
|
|
Subject: [PATCH] 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 d07f8d616..5d26f326e 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 \
|
|
@@ -119,5 +119,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
|