diff options
| author | Arvind Sankar <[email protected]> | 2020-07-11 19:35:58 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-07-14 17:33:44 -0700 |
| commit | 38e2e9ce8327284b2d516874308300aa96102fe9 (patch) | |
| tree | 0761f7f696e4da7888a0c99ffb3a91a63ecefdd4 /etc/modules-load.d | |
| parent | bdb518c13abb9eca8d6f8f1d9e2096dc5163a9e7 (diff) | |
Centralize variable substitution
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 <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10559
Diffstat (limited to 'etc/modules-load.d')
| -rw-r--r-- | etc/modules-load.d/Makefile.am | 12 | ||||
| -rw-r--r-- | etc/modules-load.d/zfs.conf (renamed from etc/modules-load.d/zfs.conf.in) | 0 |
2 files changed, 1 insertions, 11 deletions
diff --git a/etc/modules-load.d/Makefile.am b/etc/modules-load.d/Makefile.am index 1c1f8458a..8a2955767 100644 --- a/etc/modules-load.d/Makefile.am +++ b/etc/modules-load.d/Makefile.am @@ -1,12 +1,2 @@ -modulesload_DATA = \ +dist_modulesload_DATA = \ zfs.conf - -EXTRA_DIST = \ - zfs.conf.in - -$(modulesload_DATA):%:%.in - -$(SED) \ - -e '' \ - $< >'$@' - -CLEANFILES = $(modulesload_DATA) diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf index 44e1bb3ed..44e1bb3ed 100644 --- a/etc/modules-load.d/zfs.conf.in +++ b/etc/modules-load.d/zfs.conf |