diff options
| author | Antonio Russo <[email protected]> | 2018-06-07 12:59:59 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-06-07 09:59:59 -0700 |
| commit | 39042f97365c0e677e5e77ded90372526422afdf (patch) | |
| tree | feaf6e681cc3b9bd677bfd442b4e54e14c1b8a33 /man/man8 | |
| parent | fba33c3819761487a75c8f1307482959105a6269 (diff) | |
Tunable directory for zfs runtime scripts
zpool and zed place scripts in subdirectories of libexecdir. Some
distributions locate architecture independent scripts in other locations
(e.g. Debian). To avoid these paths getting out of sync, centralize the
definitions.
Build zfs-test's default.cfg by Makefile. Use the new directory
logic building tests/zfs-tests/include/default.cfg.in.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Antonio Russo <[email protected]>
Closes #7597
Diffstat (limited to 'man/man8')
| -rw-r--r-- | man/man8/Makefile.am | 2 | ||||
| -rw-r--r-- | man/man8/zed.8.in | 2 | ||||
| -rw-r--r-- | man/man8/zfs-mount-generator.8.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index 153cd518f..5401ff06f 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ zfs-mount-generator.8.in $(nodist_man_MANS): %: %.in - -$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \ + -$(SED) -e 's,@zfsexecdir\@,$(zfsexecdir),g' \ -e 's,@runstatedir\@,$(runstatedir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ $< >'$@' diff --git a/man/man8/zed.8.in b/man/man8/zed.8.in index 645e91795..097a8f4a7 100644 --- a/man/man8/zed.8.in +++ b/man/man8/zed.8.in @@ -201,7 +201,7 @@ The default directory for enabled ZEDLETs. .I @sysconfdir@/zfs/zed.d/zed.rc The default rc file for common variables used by ZEDLETs. .TP -.I @libexecdir@/zfs/zed.d +.I @zfsexecdir@/zed.d The default directory for installed ZEDLETs. .TP .I @runstatedir@/zed.pid diff --git a/man/man8/zfs-mount-generator.8.in b/man/man8/zfs-mount-generator.8.in index 319ac8e57..79720601d 100644 --- a/man/man8/zfs-mount-generator.8.in +++ b/man/man8/zfs-mount-generator.8.in @@ -56,7 +56,7 @@ touch Then, enable the tracking ZEDLET: .PP .RS 4 -ln -s "@libexecdir@/zfs/zed.d/history_event-zfs-list-cacher.sh" "@sysconfdir@/zfs/zed.d/" +ln -s "@zfsexecdir@/zed.d/history_event-zfs-list-cacher.sh" "@sysconfdir@/zfs/zed.d" systemctl enable zed.service |