mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 19:19:32 +03:00
5ecbb293c6
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>
35 lines
795 B
Makefile
35 lines
795 B
Makefile
pkgsysconfdir = $(sysconfdir)/zfs
|
|
|
|
pkgsysconf_DATA = \
|
|
vdev_id.conf.alias.example \
|
|
vdev_id.conf.sas_direct.example \
|
|
vdev_id.conf.sas_switch.example \
|
|
vdev_id.conf.multipath.example \
|
|
vdev_id.conf.scsi.example
|
|
pkgsysconf_SCRIPTS = \
|
|
zfs-functions
|
|
|
|
EXTRA_DIST = $(pkgsysconf_DATA) \
|
|
zfs-functions.in
|
|
|
|
$(pkgsysconf_SCRIPTS):%:%.in Makefile
|
|
-(if [ -e /etc/debian_version ]; then \
|
|
NFS_SRV=nfs-kernel-server; \
|
|
else \
|
|
NFS_SRV=nfs; \
|
|
fi; \
|
|
if [ -e /sbin/openrc-run ]; then \
|
|
SHELL=/sbin/openrc-run; \
|
|
else \
|
|
SHELL=/bin/sh; \
|
|
fi; \
|
|
$(SED) \
|
|
-e 's,@sbindir\@,$(sbindir),g' \
|
|
-e 's,@sysconfdir\@,$(sysconfdir),g' \
|
|
-e 's,@initconfdir\@,$(initconfdir),g' \
|
|
$< >'$@'; \
|
|
[ '$@' = 'zfs-functions' ] || \
|
|
chmod +x '$@')
|
|
|
|
CLEANFILES = $(pkgsysconf_SCRIPTS)
|