CC-ing bug/list again, IMHO this should be discussed publicly.
On Wed, Oct 11, 2017 at 06:41:54PM -0400, Antonio Russo wrote:
> On 10/10/17 17:43, Antonio Russo wrote:
>
> > I'll check the FHS concerns, time-permitting.
>
> With Fabian's changes, the only things that maybe looked questionable
> were the files installed to
>
> /usr/lib/${ARCH}/zfs
>
> which seem to be architecture independent shellscript. Is this what
> you are talking about? Should these files instead be located in
>
> /usr/lib/zfsutils-linux
>
> Antonio
>
either that (see attached patch, I reused /usr/lib/zfs-linux which
already contains the scrub script referenced in the cron job), or move
them to /usr/share/zfs like the zfs-test scripts? IMHO both places are
fine, /usr/lib/ARCH/zfs is definitely wrong ;)
From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbich...@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.gruenbich...@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
