mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 19:28:53 +03:00
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>
This commit is contained in:
committed by
Brian Behlendorf
parent
01243e72a5
commit
5ecbb293c6
@@ -35,7 +35,7 @@ SUPPORT
|
||||
|
||||
If you're making your own distribution and you want the scripts to
|
||||
work on that, the biggest problem you'll (probably) have is the part
|
||||
at the beginning of the "zfs-functions.in" file which sets up the
|
||||
at the beginning of the "zfs-functions" file which sets up the
|
||||
logging output.
|
||||
|
||||
INSTALLING INIT SCRIPT LINKS
|
||||
|
||||
Reference in New Issue
Block a user