c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 19:04:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Centralize variable substitution

Browse Source 
A bunch of places need to edit files to incorporate the configured paths
i.e. bindir, sbindir etc. Move this logic into a common file.

Create arc_summary by copying arc_summary[23] as appropriate at build
time instead of install time.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Closes #10559
This commit is contained in:
Arvind Sankar
2020-07-11 19:35:58 -04:00
committed by Brian Behlendorf
parent bdb518c13a
commit 38e2e9ce83
38 changed files with 156 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/zed/zed.d/Makefile.am
+3 -9
View File
@@ -1,8 +1,7 @@
include $(top_srcdir)/config/Rules.am
include $(top_srcdir)/config/Substfiles.am
EXTRA_DIST = \
README \
history_event-zfs-list-cacher.sh.in
EXTRA_DIST += README
zedconfdir = $(sysconfdir)/zfs/zed.d
@@ -29,12 +28,7 @@ dist_zedexec_SCRIPTS = \
nodist_zedexec_SCRIPTS = history_event-zfs-list-cacher.sh
$(nodist_zedexec_SCRIPTS): %: %.in
-$(SED) -e 's,@bindir\@,$(bindir),g' \
-e 's,@runstatedir\@,$(runstatedir),g' \
-e 's,@sbindir\@,$(sbindir),g' \
-e 's,@sysconfdir\@,$(sysconfdir),g' \
$< >'$@'
SUBSTFILES += $(nodist_zedexec_SCRIPTS)
zedconfdefaults = \
all-syslog.sh \