diff options
| author | Richard Laager <[email protected]> | 2020-02-06 09:28:20 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-03-10 09:53:20 -0700 |
| commit | 5ecbb293c64ee88257e1e21fa155cf75fdd8cbd8 (patch) | |
| tree | c6459ba5632f184821d137f66a5873d21a052003 /etc/Makefile.am | |
| parent | 01243e72a5d7144345a9c13ab4455a52003fc0af (diff) | |
Fix zfs-functions packaging bug
This fixes a bug where the generated zfs-functions was being included
along with original zfs-functions.in in the make dist tarball. This
caused an unfortunate series of events during build/packaging that
resulted in the RPM-installed /etc/zfs/zfs-functions listing the
paths as:
ZFS="/usr/local/sbin/zfs"
ZED="/usr/local/sbin/zed"
ZPOOL="/usr/local/sbin/zpool"
When they should have been:
ZFS="/sbin/zfs"
ZED="/sbin/zed"
ZPOOL="/sbin/zpool"
This affects init.d (non-systemd) distros like CentOS 6.
/etc/default/zfs and /etc/zfs/zfs-functions are also used by the
initramfs, so they need to be built even when init.d support is not.
They have been moved to the (new) etc/default and (existing) etc/zfs
source directories, respectively.
Fixes: #9443
Co-authored-by: Tony Hutter <[email protected]>
Signed-off-by: Richard Laager <[email protected]>
Diffstat (limited to 'etc/Makefile.am')
| -rw-r--r-- | etc/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am index 28b955106..67ef94a20 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = zfs sudoers.d $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD) -DIST_SUBDIRS = init.d zfs systemd modules-load.d sudoers.d +SUBDIRS = default zfs sudoers.d $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD) +DIST_SUBDIRS = default init.d zfs systemd modules-load.d sudoers.d |