diff options
| author | Richard Laager <[email protected]> | 2020-05-02 18:46:46 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-05-07 16:39:08 -0700 |
| commit | 4cfd339ce4ae1fb199fad04ff826e67b221cfb41 (patch) | |
| tree | 06e87fac58f6a25a22b2b37dbe577fc177e951c6 /configure.ac | |
| parent | 657fd33bcff17e44ad55dffdf294d7c107b4bf5d (diff) | |
Cleanup contrib/initramfs automake
The initramfs hook scripts depend on Makefile. This way, if the
substitution code is changed, they should update. This brings it in
line with etc/init.d (which was modified to match the example in the
automake docs).
The initramfs hook script cleaning now matches etc/init.d.
There was a mix of SUBDIRS recursion and custom install rules for files
in subdirectories. This was duplicated for the "hooks" and "scripts"
subdirectories. Now everything uses SUBDIRS.
I fixed the substitution of DEFAULT_INITCONF_DIR for hooks/zfs.
Reviewed-By: Andrey Prokopenko <[email protected]>
Reviewed-By: Brian Behlendorf <[email protected]>
Reviewed-By: Tom Caputi <[email protected]>
Signed-off-by: Richard Laager <[email protected]>
Closes #10027
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 902108f36..9f20b2bea 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,8 @@ AC_CONFIG_FILES([ contrib/dracut/90zfs/Makefile contrib/dracut/Makefile contrib/initramfs/Makefile + contrib/initramfs/conf.d/Makefile + contrib/initramfs/conf-hooks.d/Makefile contrib/initramfs/hooks/Makefile contrib/initramfs/scripts/Makefile contrib/initramfs/scripts/local-top/Makefile |