diff options
| author | Richard Laager <[email protected]> | 2020-02-06 09:28:20 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-03-10 09:53:20 -0700 |
| commit | 5ecbb293c64ee88257e1e21fa155cf75fdd8cbd8 (patch) | |
| tree | c6459ba5632f184821d137f66a5873d21a052003 /contrib/initramfs | |
| parent | 01243e72a5d7144345a9c13ab4455a52003fc0af (diff) | |
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 <[email protected]>
Signed-off-by: Richard Laager <[email protected]>
Diffstat (limited to 'contrib/initramfs')
| -rw-r--r-- | contrib/initramfs/Makefile.am | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am index 52bdeb2af..849b1d83c 100644 --- a/contrib/initramfs/Makefile.am +++ b/contrib/initramfs/Makefile.am @@ -6,15 +6,10 @@ initrd_SCRIPTS = \ SUBDIRS = hooks scripts EXTRA_DIST = \ - $(top_srcdir)/etc/init.d/zfs \ - $(top_srcdir)/etc/init.d/zfs-functions \ $(top_srcdir)/contrib/initramfs/conf.d/zfs \ $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ $(top_srcdir)/contrib/initramfs/README.initramfs.markdown -$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions: - $(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions - install-initrdSCRIPTS: $(EXTRA_DIST) for d in conf.d conf-hooks.d scripts/local-top; do \ $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \ @@ -26,9 +21,3 @@ install-initrdSCRIPTS: $(EXTRA_DIST) cp $(top_builddir)/contrib/initramfs/$$d/zfs \ $(DESTDIR)$(initrddir)/$$d/; \ done - $(MKDIR_P) $(DESTDIR)$(DEFAULT_INITCONF_DIR); \ - cp $(top_builddir)/etc/init.d/zfs \ - $(DESTDIR)$(DEFAULT_INITCONF_DIR)/; \ - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/zfs; \ - cp $(top_builddir)/etc/init.d/zfs-functions \ - $(DESTDIR)$(sysconfdir)/zfs/ |