summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-05-26 16:56:58 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-05-26 16:57:11 -0700
commit20207419457c676f156e212bf03cf27982eea494 (patch)
tree97aa93fef35e6c1bf613060ca5477320d86970d9 /sys-fs/zfs/files
parentapp-metrics/fusioninventory-agent: add startup files (diff)
downloadgentoo-20207419457c676f156e212bf03cf27982eea494.tar.gz
gentoo-20207419457c676f156e212bf03cf27982eea494.tar.bz2
gentoo-20207419457c676f156e212bf03cf27982eea494.zip
sys-fs/zfs: revbump 0.8.4, fix not loading /etc/conf.d/zfs
Upstream issue: https://github.com/openzfs/zfs/issues/10375 Upstream issue: https://github.com/openzfs/zfs/issues/10341 Bug: https://bugs.gentoo.org/647688 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'sys-fs/zfs/files')
-rw-r--r--sys-fs/zfs/files/0.8.4-initconfdir.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch
new file mode 100644
index 000000000000..aac40896f39b
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.4-initconfdir.patch
@@ -0,0 +1,35 @@
+From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 26 May 2020 16:44:54 -0700
+Subject: [PATCH] 0.8.4 initconfdir
+
+fix for https://github.com/openzfs/zfs/issues/10375
+
+---
+ etc/zfs/Makefile.am | 1 +
+ etc/zfs/Makefile.in | 9 +++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am
+index 81567a4..5370f41 100644
+--- a/etc/zfs/Makefile.am
++++ b/etc/zfs/Makefile.am
+@@ -1,4 +1,5 @@
+ pkgsysconfdir = $(sysconfdir)/zfs
++initconfdir = $(DEFAULT_INITCONF_DIR)
+
+ pkgsysconf_DATA = \
+ vdev_id.conf.alias.example \
+diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
+index fb02811..795d3b1 100644
+@@ -571,6 +571,7 @@ udevdir = @udevdir@
+ udevruledir = @udevruledir@
+ zfsexecdir = @zfsexecdir@
+ pkgsysconfdir = $(sysconfdir)/zfs
++initconfdir = $(DEFAULT_INITCONF_DIR)
+ pkgsysconf_DATA = \
+ vdev_id.conf.alias.example \
+ vdev_id.conf.sas_direct.example \
+--
+2.26.2
+