HomeFreeBSD

Fix zfs-functions packaging bug

Description

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 <hutter2@llnl.gov>
Signed-off-by: Richard Laager <rlaager@wiktel.com>

Details

Provenance
Richard Laager <rlaager@wiktel.com>Authored on Feb 6 2020, 5:28 PM
Brian Behlendorf <behlendorf1@llnl.gov>Committed on Mar 10 2020, 4:53 PM
Parents
rG01243e72a5d7: initramfs: Eliminate substitutions
Branches
Unknown
Tags
Unknown

Event Timeline

Brian Behlendorf <behlendorf1@llnl.gov> committed rG5ecbb293c64e: Fix zfs-functions packaging bug (authored by Richard Laager <rlaager@wiktel.com>).Mar 10 2020, 4:53 PM