]> git.proxmox.com Git - mirror_zfs.git/commit
Fix zfs-functions packaging bug
authorRichard Laager <rlaager@wiktel.com>
Thu, 6 Feb 2020 17:28:20 +0000 (09:28 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 10 Mar 2020 16:53:20 +0000 (09:53 -0700)
commit5ecbb293c64ee88257e1e21fa155cf75fdd8cbd8
treec6459ba5632f184821d137f66a5873d21a052003
parent01243e72a5d7144345a9c13ab4455a52003fc0af
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>
14 files changed:
configure.ac
contrib/initramfs/Makefile.am
etc/Makefile.am
etc/default/.gitignore [new file with mode: 0644]
etc/default/Makefile.am [new file with mode: 0644]
etc/default/zfs.in [new file with mode: 0644]
etc/init.d/.gitignore
etc/init.d/Makefile.am
etc/init.d/README.md
etc/init.d/zfs-functions.in [deleted file]
etc/init.d/zfs.in [deleted file]
etc/zfs/.gitignore [new file with mode: 0644]
etc/zfs/Makefile.am
etc/zfs/zfs-functions.in [new file with mode: 0644]