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 /contrib/initramfs | |
| 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 'contrib/initramfs')
| -rw-r--r-- | contrib/initramfs/hooks/Makefile.am | 17 | ||||
| -rwxr-xr-x | contrib/initramfs/hooks/zfs.in | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/contrib/initramfs/hooks/Makefile.am b/contrib/initramfs/hooks/Makefile.am index 8da1c4835..f303e995b 100644 --- a/contrib/initramfs/hooks/Makefile.am +++ b/contrib/initramfs/hooks/Makefile.am @@ -1,20 +1,9 @@ +include $(top_srcdir)/config/Substfiles.am + hooksdir = /usr/share/initramfs-tools/hooks hooks_SCRIPTS = \ zfs \ zfsunlock -EXTRA_DIST = \ - zfs.in \ - zfsunlock.in - -$(hooks_SCRIPTS):%:%.in Makefile - -$(SED) -e 's,@sbindir\@,$(sbindir),g' \ - -e 's,@sysconfdir\@,$(sysconfdir),g' \ - -e 's,@udevdir\@,$(udevdir),g' \ - -e 's,@udevruledir\@,$(udevruledir),g' \ - -e 's,@mounthelperdir\@,$(mounthelperdir),g' \ - -e 's,@DEFAULT_INITCONF_DIR\@,$(DEFAULT_INITCONF_DIR),g' \ - $< >'$@' - -CLEANFILES = $(hooks_SCRIPTS) +SUBSTFILES += $(hooks_SCRIPTS) diff --git a/contrib/initramfs/hooks/zfs.in b/contrib/initramfs/hooks/zfs.in index ff7e49f12..67d27a764 100755 --- a/contrib/initramfs/hooks/zfs.in +++ b/contrib/initramfs/hooks/zfs.in @@ -12,7 +12,7 @@ COPY_EXEC_LIST="@sbindir@/zdb @sbindir@/zpool @sbindir@/zfs" COPY_EXEC_LIST="$COPY_EXEC_LIST @mounthelperdir@/mount.zfs @udevdir@/vdev_id" COPY_EXEC_LIST="$COPY_EXEC_LIST @udevdir@/zvol_id" COPY_FILE_LIST="/etc/hostid @sysconfdir@/zfs/zpool.cache" -COPY_FILE_LIST="$COPY_FILE_LIST @DEFAULT_INITCONF_DIR@/zfs" +COPY_FILE_LIST="$COPY_FILE_LIST @initconfdir@/zfs" COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/zfs/zfs-functions" COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/zfs/vdev_id.conf" COPY_FILE_LIST="$COPY_FILE_LIST @udevruledir@/60-zvol.rules" |