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>
24 lines
720 B
Makefile
24 lines
720 B
Makefile
initrddir = /usr/share/initramfs-tools
|
|
|
|
initrd_SCRIPTS = \
|
|
conf.d/zfs conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs
|
|
|
|
SUBDIRS = hooks scripts
|
|
|
|
EXTRA_DIST = \
|
|
$(top_srcdir)/contrib/initramfs/conf.d/zfs \
|
|
$(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
|
|
$(top_srcdir)/contrib/initramfs/README.initramfs.markdown
|
|
|
|
install-initrdSCRIPTS: $(EXTRA_DIST)
|
|
for d in conf.d conf-hooks.d scripts/local-top; do \
|
|
$(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
|
|
cp $(top_srcdir)/contrib/initramfs/$$d/zfs \
|
|
$(DESTDIR)$(initrddir)/$$d/; \
|
|
done
|
|
for d in hooks scripts; do \
|
|
$(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
|
|
cp $(top_builddir)/contrib/initramfs/$$d/zfs \
|
|
$(DESTDIR)$(initrddir)/$$d/; \
|
|
done
|