git.squeep.com Git - portage-squeep/blob - sys-fs/zfs/files/0.8.3-zfs-functions.patch

   1 From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001
   2 From: Tony Hutter <hutter2@llnl.gov>
   3 Date: Thu, 6 Feb 2020 09:28:20 -0800
   4 Subject: [PATCH] Fix zfs-functions packaging bug
   5
   6 This fixes a bug where the generated zfs-functions was being included along
   7 with original zfs-functions.in in the make dist tarball.  This caused an
   8 unfortunate series of events during build/packaging that resulted in the
   9 RPM-installed /etc/zfs/zfs-functions listing the paths as:
  10
  11 ZFS="/usr/local/sbin/zfs"
  12 ZED="/usr/local/sbin/zed"
  13 ZPOOL="/usr/local/sbin/zpool"
  14
  15 When they should have been:
  16
  17 ZFS="/sbin/zfs"
  18 ZED="/sbin/zed"
  19 ZPOOL="/sbin/zpool"
  20
  21 This affects init.d (non-systemd) distros like CentOS 6.
  22
  23 Fixes: #9443
  24
  25 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
  26 ---
  27  contrib/initramfs/Makefile.am | 7 ++-----
  28  1 file changed, 2 insertions(+), 5 deletions(-)
  29
  30 diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
  31 index 52bdeb2afe5..4e52e8ea5e9 100644
  32 --- a/contrib/initramfs/Makefile.am
  33 +++ b/contrib/initramfs/Makefile.am
  34 @@ -6,15 +6,12 @@ initrd_SCRIPTS = \
  35  SUBDIRS = hooks scripts
  36
  37  EXTRA_DIST = \
  38 -       $(top_srcdir)/etc/init.d/zfs \
  39 -       $(top_srcdir)/etc/init.d/zfs-functions \
  40 +       $(top_srcdir)/etc/init.d/zfs.in \
  41 +       $(top_srcdir)/etc/init.d/zfs-functions.in \
  42         $(top_srcdir)/contrib/initramfs/conf.d/zfs \
  43         $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
  44         $(top_srcdir)/contrib/initramfs/README.initramfs.markdown
  45
  46 -$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions:
  47 -       $(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions
  48 -
  49  install-initrdSCRIPTS: $(EXTRA_DIST)
  50         for d in conf.d conf-hooks.d scripts/local-top; do \
  51                 $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \