* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2015-10-01 23:02 Richard Yao
0 siblings, 0 replies; 9+ messages in thread
From: Richard Yao @ 2015-10-01 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 11451485c6e8e4f52d0f2096c9bf0b7100ecc865
Author: Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 1 23:02:09 2015 +0000
Commit: Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 23:02:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11451485
sys-fs/zfs-0.6.5-r1: Add missing patch file
This should have been in the previous commit.
Signed-off-by: Richard Yao <ryao <AT> gentoo.org>
.../zfs/files/zfs-0.6.5-fix-openrc-scripts.patch | 256 +++++++++++++++++++++
1 file changed, 256 insertions(+)
diff --git a/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch b/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch
new file mode 100644
index 0000000..fec87d0
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.5-fix-openrc-scripts.patch
@@ -0,0 +1,256 @@
+commit 3cb750b249717b43cbfcde78b44b0e38a2a61dc2
+Author: James Lee <jlee@thestaticvoid.com>
+Date: Sat Sep 19 22:00:36 2015 -0400
+
+ zfs-import: Perform verbatim import using cache file
+
+ This change modifies the import service to use the default cache file
+ to perform a verbatim import of pools at boot. This fixes code that
+ searches all devices and imported all visible pools.
+
+ Using the cache file is in keeping with the way ZFS has always worked,
+ how Solaris, Illumos, FreeBSD, and systemd performs imports, and is how
+ it is written in the man page (zpool(1M,8)):
+
+ All pools in this cache are automatically imported when the
+ system boots.
+
+ Importantly, the cache contains important information for importing
+ multipath devices, and helps control which pools get imported in more
+ dynamic environments like SANs, which may have thousands of visible
+ and constantly changing pools, which the ZFS_POOL_EXCEPTIONS variable
+ is not equipped to handle. Verbatim imports prevent rogue pools from
+ being automatically imported and mounted where they shouldn't be.
+
+ The change also stops the service from exporting pools at shutdown.
+ Exporting pools is only meant to be performed explicitly by the
+ administrator of the system.
+
+ The old behavior of searching and importing all visible pools is
+ preserved and can be switched on by heeding the warning and toggling
+ the ZPOOL_IMPORT_ALL_VISIBLE variable in /etc/default/zfs.
+
+ Closes #3777
+ Closes #3526
+
+diff --git a/etc/init.d/zfs-import.in b/etc/init.d/zfs-import.in
+index 5e21929..2258638 100755
+--- a/etc/init.d/zfs-import.in
++++ b/etc/init.d/zfs-import.in
+@@ -1,11 +1,10 @@
+ #!@SHELL@
+ #
+-# zfs-import This script will import/export zfs pools.
++# zfs-import This script will import ZFS pools
+ #
+ # chkconfig: 2345 01 99
+-# description: This script will import/export zfs pools during system
+-# boot/shutdown.
+-# It is also responsible for all userspace zfs services.
++# description: This script will perform a verbatim import of ZFS pools
++# during system boot.
+ # probe: true
+ #
+ ### BEGIN INIT INFO
+@@ -17,7 +16,7 @@
+ # X-Start-Before: checkfs
+ # X-Stop-After: zfs-mount
+ # Short-Description: Import ZFS pools
+-# Description: Run the `zpool import` or `zpool export` commands.
++# Description: Run the `zpool import` command.
+ ### END INIT INFO
+ #
+ # NOTE: Not having '$local_fs' on Required-Start but only on Required-Stop
+@@ -43,6 +42,16 @@ do_depend()
+ keyword -lxc -openvz -prefix -vserver
+ }
+
++# Use the zpool cache file to import pools
++do_verbatim_import()
++{
++ if [ -f "$ZPOOL_CACHE" ]
++ then
++ zfs_action "Importing ZFS pool(s)" \
++ "$ZPOOL" import -c "$ZPOOL_CACHE" -N -a
++ fi
++}
++
+ # Support function to get a list of all pools, separated with ';'
+ find_pools()
+ {
+@@ -60,8 +69,8 @@ find_pools()
+ echo "${pools%%;}" # Return without the last ';'.
+ }
+
+-# Import all pools
+-do_import()
++# Find and import all visible pools, even exported ones
++do_import_all_visible()
+ {
+ local already_imported available_pools pool npools
+ local exception dir ZPOOL_IMPORT_PATH RET=0 r=1
+@@ -109,7 +118,7 @@ do_import()
+ fi
+ fi
+
+- # Filter out any exceptions...
++ # Filter out any exceptions...
+ if [ -n "$ZFS_POOL_EXCEPTIONS" ]
+ then
+ local found=""
+@@ -249,41 +258,15 @@ do_import()
+ return "$RET"
+ }
+
+-# Export all pools
+-do_export()
++do_import()
+ {
+- local already_imported pool root_pool RET r
+- RET=0
+-
+- root_pool=$(get_root_pool)
+-
+- [ -n "$init" ] && zfs_log_begin_msg "Exporting ZFS pool(s)"
+-
+- # Find list of already imported pools.
+- already_imported=$(find_pools "$ZPOOL" list -H -oname)
+-
+- OLD_IFS="$IFS" ; IFS=";"
+- for pool in $already_imported; do
+- [ "$pool" = "$root_pool" ] && continue
+-
+- if [ -z "$init" ]
+- then
+- # Interactive - one 'Importing ...' line per pool
+- zfs_log_begin_msg "Exporting ZFS pool $pool"
+- else
+- # Not interactive - a dot for each pool.
+- zfs_log_progress_msg "."
+- fi
+-
+- "$ZPOOL" export "$pool"
+- r="$?" ; RET=$((RET + r))
+- [ -z "$init" ] && zfs_log_end_msg "$r"
+- done
+- IFS="$OLD_IFS"
+-
+- [ -n "$init" ] && zfs_log_end_msg "$RET"
+-
+- return "$RET"
++ if check_boolean "$ZPOOL_IMPORT_ALL_VISIBLE"
++ then
++ do_import_all_visible
++ else
++ # This is the default option
++ do_verbatim_import
++ fi
+ }
+
+ # Output the status and list of pools
+@@ -323,14 +306,6 @@ do_start()
+ fi
+ }
+
+-do_stop()
+-{
+- # Check to see if the module is even loaded.
+- check_module_loaded "zfs" || exit 0
+-
+- do_export
+-}
+-
+ # ----------------------------------------------------
+
+ if [ ! -e /etc/gentoo-release ]
+@@ -340,7 +315,7 @@ then
+ do_start
+ ;;
+ stop)
+- do_stop
++ # no-op
+ ;;
+ status)
+ do_status
+@@ -350,7 +325,7 @@ then
+ ;;
+ *)
+ [ -n "$1" ] && echo "Error: Unknown command $1."
+- echo "Usage: $0 {start|stop|status}"
++ echo "Usage: $0 {start|status}"
+ exit 3
+ ;;
+ esac
+@@ -360,6 +335,5 @@ else
+ # Create wrapper functions since Gentoo don't use the case part.
+ depend() { do_depend; }
+ start() { do_start; }
+- stop() { do_stop; }
+ status() { do_status; }
+ fi
+diff --git a/etc/init.d/zfs.in b/etc/init.d/zfs.in
+index eabb7e4..d81ef22 100644
+--- a/etc/init.d/zfs.in
++++ b/etc/init.d/zfs.in
+@@ -16,6 +16,24 @@ ZFS_SHARE='yes'
+ # Run `zfs unshare -a` during system stop?
+ ZFS_UNSHARE='yes'
+
++# By default, a verbatim import of all pools is performed at boot based on the
++# contents of the default zpool cache file. The contents of the cache are
++# managed automatically by the 'zpool import' and 'zpool export' commands.
++#
++# By setting this to 'yes', the system will instead search all devices for
++# pools and attempt to import them all at boot, even those that have been
++# exported. Under this mode, the search path can be controlled by the
++# ZPOOL_IMPORT_PATH variable and a list of pools that should not be imported
++# can be listed in the ZFS_POOL_EXCEPTIONS variable.
++#
++# Note that importing all visible pools may include pools that you don't
++# expect, such as those on removable devices and SANs, and those pools may
++# proceed to mount themselves in places you do not want them to. The results
++# can be unpredictable and possibly dangerous. Only enable this option if you
++# understand this risk and have complete physical control over your system and
++# SAN to prevent the insertion of malicious pools.
++ZPOOL_IMPORT_ALL_VISIBLE='no'
++
+ # Specify specific path(s) to look for device nodes and/or links for the
+ # pool import(s). See zpool(8) for more information about this variable.
+ # It supersedes the old USE_DISK_BY_ID which indicated that it would only
+@@ -23,6 +41,18 @@ ZFS_UNSHARE='yes'
+ # The old variable will still work in the code, but is deprecated.
+ #ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:/dev/disk/by-id"
+
++# List of pools that should NOT be imported at boot
++# when ZPOOL_IMPORT_ALL_VISIBLE is 'yes'.
++# This is a space separated list.
++#ZFS_POOL_EXCEPTIONS="test2"
++
++# List of pools that SHOULD be imported at boot by the initramfs
++# instead of trying to import all available pools. If this is set
++# then ZFS_POOL_EXCEPTIONS is ignored.
++# Only applicable for Debian GNU/Linux {dkms,initramfs}.
++# This is a semi-colon separated list.
++#ZFS_POOL_IMPORT="pool1;pool2"
++
+ # Should the datasets be mounted verbosely?
+ # A mount counter will be used when mounting if set to 'yes'.
+ VERBOSE_MOUNT='no'
+@@ -97,17 +127,6 @@ ZFS_INITRD_POST_MODPROBE_SLEEP='0'
+ # Example: If root FS is 'rpool/ROOT/rootfs', this would make sense.
+ #ZFS_INITRD_ADDITIONAL_DATASETS="rpool/ROOT/usr rpool/ROOT/var"
+
+-# List of pools that should NOT be imported at boot?
+-# This is a space separated list.
+-#ZFS_POOL_EXCEPTIONS="test2"
+-
+-# List of pools to import?
+-# If this variable is set, there will be NO auto-import of ANY other
+-# pool. In essence, there will be no auto detection of availible pools.
+-# This is a semi-colon separated list.
+-# Makes the variable ZFS_POOL_EXCEPTIONS above redundant (won't be checked).
+-#ZFS_POOL_IMPORT="pool1;pool2"
+-
+ # Optional arguments for the ZFS Event Daemon (ZED).
+ # See zed(8) for more information on available options.
+ #ZED_ARGS="-M"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2019-11-26 21:25 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2019-11-26 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 773bb1832df3815cd68c314d31d30045b001e9c9
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 21:23:36 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 21:25:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773bb183
sys-fs/zfs: fix 0.8.2-r2 patch path
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
index be88f7bfee8..00dda6de55c 100644
--- a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
+++ b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
@@ -35,10 +35,10 @@ Closes #9436
man/man8/zpool.8 | 6 ++++++
2 files changed, 16 insertions(+), 1 deletion(-)
-diff --git a/lib/libzutil/os/linux/zutil_import_os.c b/lib/libzutil/os/linux/zutil_import_os.c
+diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c
index 811eae397c9..e51004edc68 100644
---- a/lib/libzutil/os/linux/zutil_import_os.c
-+++ b/lib/libzutil/os/linux/zutil_import_os.c
+--- a/lib/libzutil/zutil_import.c
++++ b/lib/libzutil/zutil_import.c
@@ -53,6 +53,7 @@
#include <libgen.h>
#include <stddef.h>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2020-06-10 23:49 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2020-06-10 23:49 UTC (permalink / raw
To: gentoo-commits
commit: 244438471848f4a488e951cc0403d20a1927b29f
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 23:48:19 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 23:49:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24443847
sys-fs/zfs: clean up files dir
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
.../0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch | 70 ------------------
sys-fs/zfs/files/0.8.3-fno-common.patch | 83 ----------------------
sys-fs/zfs/files/0.8.3-zfs-functions.patch | 51 -------------
sys-fs/zfs/files/zfs-init.sh.in | 29 --------
sys-fs/zfs/files/zfs.service.in | 16 -----
5 files changed, 249 deletions(-)
diff --git a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
deleted file mode 100644
index 922e5951bdf..00000000000
--- a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a0767672aac01f41516550e3808ff72da893102f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Tue, 26 Nov 2019 12:07:36 -0800
-Subject: [PATCH] backport udev timeout patch
-
-https://github.com/zfsonlinux/zfs/commit/803884217f9b9b5fb235d7c5e78a809d271f6387
----
- lib/libzfs/libzfs_import.c | 11 ++++++++++-
- man/man8/zpool.8 | 6 ++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
-index 9dbf207..cd08806 100644
---- a/lib/libzfs/libzfs_import.c
-+++ b/lib/libzfs/libzfs_import.c
-@@ -53,6 +53,7 @@
- #endif
- #include <stddef.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -1594,17 +1595,25 @@ zpool_open_func(void *arg)
- if (rn->rn_labelpaths) {
- char *path = NULL;
- char *devid = NULL;
-+ char *env = NULL;
- rdsk_node_t *slice;
- avl_index_t where;
-+ int timeout;
- int error;
-
- if (label_paths(rn->rn_hdl, rn->rn_config, &path, &devid))
- return;
-
-+ env = getenv("ZPOOL_IMPORT_UDEV_TIMEOUT_MS");
-+ if ((env == NULL) || sscanf(env, "%d", &timeout) != 1 ||
-+ timeout < 0) {
-+ timeout = DISK_LABEL_WAIT;
-+ }
-+
- /*
- * Allow devlinks to stabilize so all paths are available.
- */
-- zpool_label_disk_wait(rn->rn_name, DISK_LABEL_WAIT);
-+ zpool_label_disk_wait(rn->rn_name, timeout);
-
- if (path != NULL) {
- slice = zfs_alloc(hdl, sizeof (rdsk_node_t));
-diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
-index 46e531e..10a19b5 100644
---- a/man/man8/zpool.8
-+++ b/man/man8/zpool.8
-@@ -2291,6 +2291,12 @@ Similar to the
- option in
- .Nm zpool import .
- .El
-+.Bl -tag -width "ZPOOL_IMPORT_UDEV_TIMEOUT_MS"
-+.It Ev ZPOOL_IMPORT_UDEV_TIMEOUT_MS
-+The maximum time in milliseconds that
-+.Nm zpool import
-+will wait for an expected device to be available.
-+.El
- .Bl -tag -width "ZPOOL_VDEV_NAME_GUID"
- .It Ev ZPOOL_VDEV_NAME_GUID
- Cause
---
-2.24.0
-
diff --git a/sys-fs/zfs/files/0.8.3-fno-common.patch b/sys-fs/zfs/files/0.8.3-fno-common.patch
deleted file mode 100644
index 3b09d8bbc59..00000000000
--- a/sys-fs/zfs/files/0.8.3-fno-common.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From af09c050e95bebbaeca52156218f3f91e8c9951a Mon Sep 17 00:00:00 2001
-From: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
-Date: Thu, 6 Feb 2020 18:25:29 +0100
-Subject: [PATCH] Fix static data to link with -fno-common
-
--fno-common is the new default in GCC 10, replacing -fcommon in
-GCC <= 9, so static data must only be allocated once.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
-Closes #9943
----
- cmd/zfs/zfs_util.h | 2 +-
- cmd/zpool/zpool_main.c | 2 ++
- cmd/zpool/zpool_util.h | 2 +-
- lib/libshare/smb.c | 2 ++
- lib/libshare/smb.h | 2 +-
- 5 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/cmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h
-index 3ddff9e22d7..a56af59adb1 100644
---- a/cmd/zfs/zfs_util.h
-+++ b/cmd/zfs/zfs_util.h
-@@ -33,7 +33,7 @@ extern "C" {
-
- void * safe_malloc(size_t size);
- void nomem(void);
--libzfs_handle_t *g_zfs;
-+extern libzfs_handle_t *g_zfs;
-
- #ifdef __cplusplus
- }
-diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
-index ae5e8a370fc..ff4f44d4652 100644
---- a/cmd/zpool/zpool_main.c
-+++ b/cmd/zpool/zpool_main.c
-@@ -76,6 +76,8 @@
-
- #include "statcommon.h"
-
-+libzfs_handle_t *g_zfs;
-+
- static int zpool_do_create(int, char **);
- static int zpool_do_destroy(int, char **);
-
-diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h
-index ce760df723c..1f23f61aaa4 100644
---- a/cmd/zpool/zpool_util.h
-+++ b/cmd/zpool/zpool_util.h
-@@ -79,7 +79,7 @@ void pool_list_free(zpool_list_t *);
- int pool_list_count(zpool_list_t *);
- void pool_list_remove(zpool_list_t *, zpool_handle_t *);
-
--libzfs_handle_t *g_zfs;
-+extern libzfs_handle_t *g_zfs;
-
-
- typedef struct vdev_cmd_data
-diff --git a/lib/libshare/smb.c b/lib/libshare/smb.c
-index a95607ee032..f567f7c49d7 100644
---- a/lib/libshare/smb.c
-+++ b/lib/libshare/smb.c
-@@ -65,6 +65,8 @@ static boolean_t smb_available(void);
-
- static sa_fstype_t *smb_fstype;
-
-+smb_share_t *smb_shares;
-+
- /*
- * Retrieve the list of SMB shares.
- */
-diff --git a/lib/libshare/smb.h b/lib/libshare/smb.h
-index 7a0c0fd162d..8ea44677f9a 100644
---- a/lib/libshare/smb.h
-+++ b/lib/libshare/smb.h
-@@ -44,6 +44,6 @@ typedef struct smb_share_s {
- struct smb_share_s *next;
- } smb_share_t;
-
--smb_share_t *smb_shares;
-+extern smb_share_t *smb_shares;
-
- void libshare_smb_init(void);
diff --git a/sys-fs/zfs/files/0.8.3-zfs-functions.patch b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
deleted file mode 100644
index 9cce3e1c1a7..00000000000
--- a/sys-fs/zfs/files/0.8.3-zfs-functions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001
-From: Tony Hutter <hutter2@llnl.gov>
-Date: Thu, 6 Feb 2020 09:28:20 -0800
-Subject: [PATCH] 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.
-
-Fixes: #9443
-
-Signed-off-by: Tony Hutter <hutter2@llnl.gov>
----
- contrib/initramfs/Makefile.am | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
-index 52bdeb2afe5..4e52e8ea5e9 100644
---- a/contrib/initramfs/Makefile.am
-+++ b/contrib/initramfs/Makefile.am
-@@ -6,15 +6,12 @@ initrd_SCRIPTS = \
- SUBDIRS = hooks scripts
-
- EXTRA_DIST = \
-- $(top_srcdir)/etc/init.d/zfs \
-- $(top_srcdir)/etc/init.d/zfs-functions \
-+ $(top_srcdir)/etc/init.d/zfs.in \
-+ $(top_srcdir)/etc/init.d/zfs-functions.in \
- $(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; \
diff --git a/sys-fs/zfs/files/zfs-init.sh.in b/sys-fs/zfs/files/zfs-init.sh.in
deleted file mode 100644
index ed84585cd5f..00000000000
--- a/sys-fs/zfs/files/zfs-init.sh.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-ZFS="@sbindir@/zfs"
-ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
-
-if [ -f "${ZPOOL_CACHE}" ]; then
- "${ZPOOL}" import -c "${ZPOOL_CACHE}" -aN 2>/dev/null
- if [ "${?}" != "0" ]; then
- echo "Failed to import not-yet imported pools." >&2
- fi
-fi
-
-echo "Mounting ZFS filesystems"
-"${ZFS}" mount -a
-if [ "${?}" != "0" ]; then
- echo "Failed to mount ZFS filesystems." >&2
- exit 1
-fi
-
-echo "Exporting ZFS filesystems"
-"${ZFS}" share -a
-if [ "${?}" != "0" ]; then
- echo "Failed to export ZFS filesystems." >&2
- exit 1
-fi
-
-exit 0
-
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in
deleted file mode 100644
index ae2eff170a7..00000000000
--- a/sys-fs/zfs/files/zfs.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=ZFS filesystems setup
-Before=network.target
-After=systemd-udev-settle.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=-/sbin/modprobe zfs
-ExecStartPre=/usr/bin/test -c /dev/zfs
-ExecStart=/usr/libexec/zfs-init.sh
-ExecStop=@sbindir@/zfs umount -a
-
-[Install]
-WantedBy=multi-user.target
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2020-09-21 23:04 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2020-09-21 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 471655edb905e6acf88c27d7ed1ebb22e8d7d7fc
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 23:03:29 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 23:03:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471655ed
sys-fs/zfs: drop unused completion file
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/bash-completion-r1 | 391 ------------------------------------
1 file changed, 391 deletions(-)
diff --git a/sys-fs/zfs/files/bash-completion-r1 b/sys-fs/zfs/files/bash-completion-r1
deleted file mode 100644
index b1aded368e8..00000000000
--- a/sys-fs/zfs/files/bash-completion-r1
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright (c) 2013, Aneurin Price <aneurin.price@gmail.com>
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-#if [[ -w /dev/zfs ]]; then
- __ZFS_CMD="zfs"
- __ZPOOL_CMD="zpool"
-#else
-# __ZFS_CMD="sudo zfs"
-# __ZPOOL_CMD="sudo zpool"
-#fi
-
-__zfs_get_commands()
-{
- $__ZFS_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | cut -f1 -d '|' | uniq
-}
-
-__zfs_get_properties()
-{
- $__ZFS_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all name space
-}
-
-__zfs_get_editable_properties()
-{
- $__ZFS_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}'
-}
-
-__zfs_get_inheritable_properties()
-{
- $__ZFS_CMD get 2>&1 | awk '$3 == "YES" {print $1}'
-}
-
-__zfs_list_datasets()
-{
- $__ZFS_CMD list -H -o name -t filesystem,volume
-}
-
-__zfs_list_filesystems()
-{
- $__ZFS_CMD list -H -o name -t filesystem
-}
-
-__zfs_match_snapshot()
-{
- local base_dataset=${cur%@*}
- if [[ $base_dataset != $cur ]]
- then
- $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset
- else
- $__ZFS_CMD list -H -o name -t filesystem,volume | awk '{print $1"@"}'
- fi
-}
-
-__zfs_match_explicit_snapshot()
-{
- local base_dataset=${cur%@*}
- if [[ $base_dataset != $cur ]]
- then
- $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset
- fi
-}
-
-__zfs_match_multiple_snapshots()
-{
- local existing_opts=$(expr "$cur" : '\(.*\)[%,]')
- if [[ $existing_opts ]]
- then
- local base_dataset=${cur%@*}
- if [[ $base_dataset != $cur ]]
- then
- local cur=${cur##*,}
- if [[ $cur =~ ^%|%.*% ]]
- then
- # correct range syntax is start%end
- return 1
- fi
- local range_start=$(expr "$cur" : '\(.*%\)')
- $__ZFS_CMD list -H -o name -t snapshot -d 1 $base_dataset | sed 's$.*@$'$range_start'$g'
- fi
- else
- __zfs_match_explicit_snapshot; __zfs_list_datasets
- fi
-}
-
-__zfs_list_volumes()
-{
- $__ZFS_CMD list -H -o name -t volume
-}
-
-__zfs_argument_chosen()
-{
- local word property
- for word in $(seq $((COMP_CWORD-1)) -1 2)
- do
- local prev="${COMP_WORDS[$word]}"
- if [[ ${COMP_WORDS[$word-1]} != -[tos] ]]
- then
- if [[ "$prev" == [^,]*,* ]] || [[ "$prev" == *[@:]* ]]
- then
- return 0
- fi
- for property in $@
- do
- if [[ $prev == "$property" ]]
- then
- return 0
- fi
- done
- fi
- done
- return 1
-}
-
-__zfs_complete_ordered_arguments()
-{
- local list1=$1
- local list2=$2
- local cur=$3
- local extra=$4
- if __zfs_argument_chosen $list1
- then
- COMPREPLY=($(compgen -W "$list2 $extra" -- "$cur"))
- else
- COMPREPLY=($(compgen -W "$list1 $extra" -- "$cur"))
- fi
-}
-
-__zfs_complete_multiple_options()
-{
- local options=$1
- local cur=$2
-
- COMPREPLY=($(compgen -W "$options" -- "${cur##*,}"))
- local existing_opts=$(expr "$cur" : '\(.*,\)')
- if [[ $existing_opts ]]
- then
- COMPREPLY=( "${COMPREPLY[@]/#/${existing_opts}}" )
- fi
-}
-
-__zfs_complete_switch()
-{
- local options=$1
- if [[ ${cur:0:1} == - ]]
- then
- COMPREPLY=($(compgen -W "-{$options}" -- "$cur"))
- return 0
- else
- return 1
- fi
-}
-
-__zfs_complete()
-{
- local cur prev cmd cmds
- COMPREPLY=()
- # Don't split on colon
- _get_comp_words_by_ref -n : -c cur -p prev -w COMP_WORDS -i COMP_CWORD
- cmd="${COMP_WORDS[1]}"
-
- if [[ ${prev##*/} == zfs ]]
- then
- cmds=$(__zfs_get_commands)
- COMPREPLY=($(compgen -W "$cmds -?" -- "$cur"))
- return 0
- fi
-
- case "${cmd}" in
- clone)
- case "${prev}" in
- -o)
- COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur"))
- ;;
- *)
- if ! __zfs_complete_switch "o,p"
- then
- if __zfs_argument_chosen
- then
- COMPREPLY=($(compgen -W "$(__zfs_list_datasets)" -- "$cur"))
- else
- COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
- fi
- fi
- ;;
- esac
- ;;
- get)
- case "${prev}" in
- -d)
- COMPREPLY=($(compgen -W "" -- "$cur"))
- ;;
- -t)
- __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur"
- ;;
- -s)
- __zfs_complete_multiple_options "local default inherited temporary none" "$cur"
- ;;
- -o)
- __zfs_complete_multiple_options "name property value source received all" "$cur"
- ;;
- *)
- if ! __zfs_complete_switch "H,r,p,d,o,t,s"
- then
- if __zfs_argument_chosen $(__zfs_get_properties)
- then
- COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
- else
- __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur"
- fi
- fi
- ;;
- esac
- ;;
- inherit)
- if ! __zfs_complete_switch "r"
- then
- __zfs_complete_ordered_arguments "$(__zfs_get_inheritable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur
- fi
- ;;
- list)
- case "${prev}" in
- -d)
- COMPREPLY=($(compgen -W "" -- "$cur"))
- ;;
- -t)
- __zfs_complete_multiple_options "filesystem volume snapshot all" "$cur"
- ;;
- -o)
- __zfs_complete_multiple_options "$(__zfs_get_properties)" "$cur"
- ;;
- -s|-S)
- COMPREPLY=($(compgen -W "$(__zfs_get_properties)" -- "$cur"))
- ;;
- *)
- if ! __zfs_complete_switch "H,r,d,o,t,s,S"
- then
- COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
- fi
- ;;
- esac
- ;;
- promote)
- COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
- ;;
- rollback)
- if ! __zfs_complete_switch "r,R,f"
- then
- COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
- fi
- ;;
- send)
- if ! __zfs_complete_switch "d,n,P,p,R,v,i,I"
- then
- COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur"))
- fi
- ;;
- snapshot)
- case "${prev}" in
- -o)
- COMPREPLY=($(compgen -W "$(__zfs_get_editable_properties)" -- "$cur"))
- ;;
- *)
- if ! __zfs_complete_switch "o,r"
- then
- COMPREPLY=($(compgen -W "$(__zfs_list_datasets | awk '{print $1"@"}')" -- "$cur"))
- fi
- ;;
- esac
- ;;
- set)
- __zfs_complete_ordered_arguments "$(__zfs_get_editable_properties)" "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" $cur
- ;;
- upgrade)
- case "${prev}" in
- -a|-V|-v)
- COMPREPLY=($(compgen -W "" -- "$cur"))
- ;;
- *)
- if ! __zfs_complete_switch "a,V,v,r"
- then
- COMPREPLY=($(compgen -W "$(__zfs_list_filesystems)" -- "$cur"))
- fi
- ;;
- esac
- ;;
- destroy)
- if ! __zfs_complete_switch "d,f,n,p,R,r,v"
- then
- __zfs_complete_multiple_options "$(__zfs_match_multiple_snapshots)" $cur
- fi
- ;;
- *)
- COMPREPLY=($(compgen -W "$(__zfs_match_explicit_snapshot) $(__zfs_list_datasets)" -- "$cur"))
- ;;
- esac
- __ltrim_colon_completions "$cur"
- return 0
-}
-
-__zpool_get_commands()
-{
- $__ZPOOL_CMD 2>&1 | awk '/^\t[a-z]/ {print $1}' | uniq
-}
-
-__zpool_get_properties()
-{
- $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" || $2 == "NO" {print $1}'; echo all
-}
-
-__zpool_get_editable_properties()
-{
- $__ZPOOL_CMD get 2>&1 | awk '$2 == "YES" {print $1"="}'
-}
-
-__zpool_list_pools()
-{
- $__ZPOOL_CMD list -H -o name
-}
-
-__zpool_complete()
-{
- local cur prev cmd cmds
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- cmd="${COMP_WORDS[1]}"
-
- if [[ ${prev##*/} == zpool ]]
- then
- cmds=$(__zpool_get_commands)
- COMPREPLY=($(compgen -W "$cmds" -- "$cur"))
- return 0
- fi
-
- case "${cmd}" in
- get)
- __zfs_complete_ordered_arguments "$(__zpool_get_properties)" "$(__zpool_list_pools)" $cur
- return 0
- ;;
- import)
- if [[ $prev == -d ]]
- then
- _filedir -d
- else
- COMPREPLY=($(compgen -W "$(__zpool_list_pools) -d" -- "$cur"))
- fi
- return 0
- ;;
- set)
- __zfs_complete_ordered_arguments "$(__zpool_get_editable_properties)" "$(__zpool_list_pools)" $cur
- return 0
- ;;
- add|attach|clear|create|detach|offline|online|remove|replace)
- local pools="$(__zpool_list_pools)"
- if __zfs_argument_chosen $pools
- then
- _filedir
- else
- COMPREPLY=($(compgen -W "$pools" -- "$cur"))
- fi
- return 0
- ;;
- *)
- COMPREPLY=($(compgen -W "$(__zpool_list_pools)" -- "$cur"))
- return 0
- ;;
- esac
-
-}
-
-complete -F __zfs_complete zfs
-complete -F __zpool_complete zpool
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2021-12-16 2:55 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2021-12-16 2:55 UTC (permalink / raw
To: gentoo-commits
commit: d4e68cd69421906d1a576d37814cff34ae7f59b6
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 02:54:35 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 02:54:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e68cd6
sys-fs/zfs: adjust scrub timers patch according to upstream version
https://github.com/openzfs/zfs/pull/12193
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/2.1.2-scrub-timers.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/zfs/files/2.1.2-scrub-timers.patch b/sys-fs/zfs/files/2.1.2-scrub-timers.patch
index 58d1c3b6968d..f1c5b5699f62 100644
--- a/sys-fs/zfs/files/2.1.2-scrub-timers.patch
+++ b/sys-fs/zfs/files/2.1.2-scrub-timers.patch
@@ -94,7 +94,7 @@ index 000000000..c04ac292a
+if @sbindir@/zpool status %i | grep "scrub in progress"; then\
+exec @sbindir@/zpool wait -t scrub %i;\
+else exec @sbindir@/zpool scrub -w %i; fi'
-+ExecStop=-/bin/sh -c 'exec @sbindir@/zpool scrub -p %i 2>/dev/null || true'
++ExecStop=-/bin/sh -c '@sbindir@/zpool scrub -p %i 2>/dev/null || true'
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2022-09-16 23:21 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2022-09-16 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 50f69bca7ad128cf735ba43039e872a7428b17b8
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 23:21:17 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 23:21:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f69bca
sys-fs/zfs: drop unused patch
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/2.1.5-build-issues.patch | 74 -------------------------------
1 file changed, 74 deletions(-)
diff --git a/sys-fs/zfs/files/2.1.5-build-issues.patch b/sys-fs/zfs/files/2.1.5-build-issues.patch
deleted file mode 100644
index cca6561b16f7..000000000000
--- a/sys-fs/zfs/files/2.1.5-build-issues.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://github.com/openzfs/zfs/commit/a6e8113fed8a508ffda13cf1c4d8da99a4e8133a
-https://github.com/openzfs/zfs/commit/60e389ca10085acfa7cd35f79ab4465d968a942f
-Cherry-picked from https://github.com/openzfs/zfs/pull/13575
-
-https://bugs.gentoo.org/855182
---- a/config/always-compiler-options.m4
-+++ b/config/always-compiler-options.m4
-@@ -205,6 +205,29 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_OMIT_FRAME_POINTER], [
- AC_SUBST([NO_OMIT_FRAME_POINTER])
- ])
-
-+dnl #
-+dnl # Check if cc supports -Winfinite-recursion option.
-+dnl #
-+AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION], [
-+ AC_MSG_CHECKING([whether $CC supports -Winfinite-recursion])
-+
-+ saved_flags="$CFLAGS"
-+ CFLAGS="$CFLAGS -Werror -Winfinite-recursion"
-+
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
-+ INFINITE_RECURSION=-Winfinite-recursion
-+ AC_DEFINE([HAVE_INFINITE_RECURSION], 1,
-+ [Define if compiler supports -Winfinite-recursion])
-+ AC_MSG_RESULT([yes])
-+ ], [
-+ INFINITE_RECURSION=
-+ AC_MSG_RESULT([no])
-+ ])
-+
-+ CFLAGS="$saved_flags"
-+ AC_SUBST([INFINITE_RECURSION])
-+])
-+
- dnl #
- dnl # Check if cc supports -fno-ipa-sra option.
- dnl #
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -211,6 +211,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
-
- ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
- ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
-+ ZFS_AC_CONFIG_ALWAYS_CC_INFINITE_RECURSION
- ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
- ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
- ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
---- a/module/lua/ldo.c
-+++ b/module/lua/ldo.c
-@@ -168,6 +168,13 @@ static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
- L->top = oldtop + 1;
- }
-
-+/*
-+ * Silence infinite recursion warning which was added to -Wall in gcc 12.1
-+ */
-+#if defined(HAVE_INFINITE_RECURSION)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Winfinite-recursion"
-+#endif
-
- l_noret luaD_throw (lua_State *L, int errcode) {
- if (L->errorJmp) { /* thread has an error handler? */
-@@ -190,6 +197,10 @@ l_noret luaD_throw (lua_State *L, int errcode) {
- }
- }
-
-+#if defined(HAVE_INFINITE_RECURSION)
-+#pragma GCC diagnostic pop
-+#endif
-+
-
- int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
- unsigned short oldnCcalls = L->nCcalls;
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2022-09-23 20:15 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2022-09-23 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 09a38ed7d7243ffebcb5ce419ec06e7991da96df
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 19 06:54:38 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:15:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a38ed7
sys-fs/zfs: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27350
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/2.1.5-dracut-non-root.patch | 33 ----------------------------
1 file changed, 33 deletions(-)
diff --git a/sys-fs/zfs/files/2.1.5-dracut-non-root.patch b/sys-fs/zfs/files/2.1.5-dracut-non-root.patch
deleted file mode 100644
index 6d1caf92cd2d..000000000000
--- a/sys-fs/zfs/files/2.1.5-dracut-non-root.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/openzfs/zfs/pull/13589
-https://bugs.gentoo.org/854333
-
-From ef9d996669cc2ec596d4e90753b89b32a3f0ce59 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Fri, 24 Jun 2022 11:05:53 -0400
-Subject: [PATCH] Dracut module: fix parsing of root= kernel command-line
- argument
-
-Some Dracut modules may read the `root=` kernel command-line argument
-and rewrite it; in particular, `rootfs-block` installs a command-line
-hook that to canonicalize arguments that specify block devices. If the
-`zfs` module is added to an initramfs (which it is, by default, as long
-as the core ZFS utilities are available) on a system that does not use a
-ZFS root filesystem, the `zfs` module will overwrite the `root` shell
-variable with the contents of the kernel command-line in the process of
-determining if it should control mounting the root. This breaks the
-initramfs. To solve this problem, only parse the kernel command-line
-directly if the `root` shell variable is empty; otherwise, rely on the
-parsing (and possible rewriting) done by other modules.
-
-Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
---- a/contrib/dracut/90zfs/zfs-lib.sh.in
-+++ b/contrib/dracut/90zfs/zfs-lib.sh.in
-@@ -88,7 +88,7 @@ decode_root_args() {
- return
- fi
-
-- root=$(getarg root=)
-+ [ -n "$root" ] || root=$(getarg root=)
- rootfstype=$(getarg rootfstype=)
-
- # shellcheck disable=SC2249
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2023-07-04 22:17 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2023-07-04 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 26b76d6d9b171919b3988cf9f1131941c4ffc336
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 4 09:57:12 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 22:16:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b76d6d
sys-fs/zfs: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31736
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-fs/zfs/files/2.1.6-fgrep.patch | 53 ----------------------
.../2.1.7-dracut-include-systemd-overrides.patch | 44 ------------------
.../files/2.1.7-systemd-zed-restart-always.patch | 27 -----------
3 files changed, 124 deletions(-)
diff --git a/sys-fs/zfs/files/2.1.6-fgrep.patch b/sys-fs/zfs/files/2.1.6-fgrep.patch
deleted file mode 100644
index 2e47c5bcc093..000000000000
--- a/sys-fs/zfs/files/2.1.6-fgrep.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485
-
-From d30577c9dd811688f2609ad532b011b99bceb485 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
-Date: Sat, 12 Mar 2022 00:26:46 +0100
-Subject: [PATCH] fgrep -> grep -F
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Reviewed-by: John Kennedy <john.kennedy@delphix.com>
-Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
-Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Closes #13259
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -394,11 +394,11 @@ AC_DEFUN([ZFS_AC_KERNEL], [
- utsrelease1=$kernelbuild/include/linux/version.h
- utsrelease2=$kernelbuild/include/linux/utsrelease.h
- utsrelease3=$kernelbuild/include/generated/utsrelease.h
-- AS_IF([test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1], [
-+ AS_IF([test -r $utsrelease1 && grep -qF UTS_RELEASE $utsrelease1], [
- utsrelease=$utsrelease1
-- ], [test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2], [
-+ ], [test -r $utsrelease2 && grep -qF UTS_RELEASE $utsrelease2], [
- utsrelease=$utsrelease2
-- ], [test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3], [
-+ ], [test -r $utsrelease3 && grep -qF UTS_RELEASE $utsrelease3], [
- utsrelease=$utsrelease3
- ])
-
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -173,7 +173,7 @@ AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
- ])
-
- AC_DEFUN([ZFS_AC_DEBUG_INVARIANTS_DETECT_FREEBSD], [
-- AS_IF([sysctl -n kern.conftxt | fgrep -qx $'options\tINVARIANTS'],
-+ AS_IF([sysctl -n kern.conftxt | grep -Fqx $'options\tINVARIANTS'],
- [enable_invariants="yes"],
- [enable_invariants="no"])
- ])
---- a/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait.kshlib
-@@ -120,5 +120,5 @@ function check_while_waiting
- # Whether any vdev in the given pool is initializing
- function is_vdev_initializing # pool
- {
-- zpool status -i "$1" | grep 'initialized, started' >/dev/null
-+ zpool status -i "$1" | grep -q 'initialized, started'
- }
-
diff --git a/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch b/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch
deleted file mode 100644
index 2a50dc658876..000000000000
--- a/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b10f73f78eb223dd799a87474c537a69113edee1 Mon Sep 17 00:00:00 2001
-From: Vince van Oosten <techhazard@codeforyouand.me>
-Date: Sun, 23 Oct 2022 10:55:46 +0200
-Subject: [PATCH] include systemd overrides to zfs-dracut module
-
-If a user that uses systemd and dracut wants to overide certain
-settings, they typically use `systemctl edit [unit]` or place a file in
-`/etc/systemd/system/[unit].d/override.conf` directly.
-
-The zfs-dracut module did not include those overrides however, so this
-did not have any effect at boot time.
-
-For zfs-import-scan.service and zfs-import-cache.service, overrides are
-now included in the dracut initramfs image.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Vince van Oosten <techhazard@codeforyouand.me>
-Closes #14075
-Closes #14076
----
- contrib/dracut/90zfs/module-setup.sh.in | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
-index 81d7d2abe49..b16529de905 100755
---- a/contrib/dracut/90zfs/module-setup.sh.in
-+++ b/contrib/dracut/90zfs/module-setup.sh.in
-@@ -86,6 +86,16 @@ install() {
- "zfs-import-cache.service"; do
- inst_simple "${systemdsystemunitdir}/${_service}"
- systemctl -q --root "${initdir}" add-wants zfs-import.target "${_service}"
-+
-+ # Add user-provided unit overrides
-+ # - /etc/systemd/system/zfs-import-{scan,cache}.service
-+ # - /etc/systemd/system/zfs-import-{scan,cache}.service.d/overrides.conf
-+ # -H ensures they are marked host-only
-+ # -o ensures there is no error upon absence of these files
-+ inst_multiple -o -H \
-+ "${systemdsystemconfdir}/${_service}" \
-+ "${systemdsystemconfdir}/${_service}.d/"*.conf
-+
- done
-
- for _service in \
diff --git a/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch b/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch
deleted file mode 100644
index 2d4b92d5c66a..000000000000
--- a/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f505cd53fd9cb6e6efb1e23a9d77e38bba754695 Mon Sep 17 00:00:00 2001
-From: George Melikov <mail@gmelikov.ru>
-Date: Fri, 16 Dec 2022 01:11:02 +0300
-Subject: [PATCH] systemd: set restart=always for zfs-zed.service
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: George Melikov <mail@gmelikov.ru>
-Co-authored-by: Attila Fülöp <attila@fueloep.org>
----
- etc/systemd/system/zfs-zed.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index 73a83e59e51..be2fc67348f 100644
---- a/etc/systemd/system/zfs-zed.service.in
-+++ b/etc/systemd/system/zfs-zed.service.in
-@@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/module/zfs
- [Service]
- EnvironmentFile=-@initconfdir@/zfs
- ExecStart=@sbindir@/zed -F
--Restart=on-abort
-+Restart=always
-
- [Install]
- Alias=zed.service
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
@ 2024-02-23 6:42 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-02-23 6:42 UTC (permalink / raw
To: gentoo-commits
commit: e2a9a0b1afbd30bbcb23339e9cd870ea435678d5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 06:41:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 06:41:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a9a0b1
sys-fs/zfs: update musl patch
Bug: https://bugs.gentoo.org/925281
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/zfs/files/2.2.3-musl.patch | 41 +++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/sys-fs/zfs/files/2.2.3-musl.patch b/sys-fs/zfs/files/2.2.3-musl.patch
index 41ce14633667..01433490e82f 100644
--- a/sys-fs/zfs/files/2.2.3-musl.patch
+++ b/sys-fs/zfs/files/2.2.3-musl.patch
@@ -1,23 +1,50 @@
https://github.com/openzfs/zfs/pull/15925
-From 3fa84afb3f4334b6609f0dcb141e5d10095e585b Mon Sep 17 00:00:00 2001
+From 68419c70dc7235a4954d6c0c09d60f9ebe694a3c Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 23 Feb 2024 05:12:09 +0000
-Subject: [PATCH] tests: use <fcntl.h> instead of <sys/fcntl.h>
+Subject: [PATCH] Use <fcntl.h> instead of <sys/fcntl.h>
When building on musl, we get:
```
In file included from tests/zfs-tests/cmd/getversion.c:22:
/usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
- | ^~~~~~~
-```
-There's some other use of <sys/fcntl.h> in the codebase, but they're on the
-module side, where libspl seems to handle it all, so not touching that.
+In file included from module/os/linux/zfs/vdev_file.c:36:
+/usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror=cpp]
+ 1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
+```
Bug: https://bugs.gentoo.org/925235
Signed-off-by: Sam James <sam@gentoo.org>
+---
+ module/os/linux/zfs/vdev_file.c | 2 +-
+ tests/zfs-tests/cmd/getversion.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c
+index 5abc0426d1..68e3042a97 100644
+--- a/module/os/linux/zfs/vdev_file.c
++++ b/module/os/linux/zfs/vdev_file.c
+@@ -23,6 +23,7 @@
+ * Copyright (c) 2011, 2020 by Delphix. All rights reserved.
+ */
+
++#include <fcntl.h>
+ #include <sys/zfs_context.h>
+ #include <sys/spa.h>
+ #include <sys/spa_impl.h>
+@@ -33,7 +34,6 @@
+ #include <sys/fs/zfs.h>
+ #include <sys/fm/fs/zfs.h>
+ #include <sys/abd.h>
+-#include <sys/fcntl.h>
+ #include <sys/vnode.h>
+ #include <sys/zfs_file.h>
+ #ifdef _KERNEL
+diff --git a/tests/zfs-tests/cmd/getversion.c b/tests/zfs-tests/cmd/getversion.c
+index 62c1c5b6ab..1e026b92d1 100644
--- a/tests/zfs-tests/cmd/getversion.c
+++ b/tests/zfs-tests/cmd/getversion.c
@@ -19,9 +19,9 @@
@@ -31,4 +58,6 @@ Signed-off-by: Sam James <sam@gentoo.org>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+--
+2.43.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-02-23 6:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-21 23:04 [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2024-02-23 6:42 Sam James
2023-07-04 22:17 Conrad Kostecki
2022-09-23 20:15 Georgy Yakovlev
2022-09-16 23:21 Georgy Yakovlev
2021-12-16 2:55 Georgy Yakovlev
2020-06-10 23:49 Georgy Yakovlev
2019-11-26 21:25 Georgy Yakovlev
2015-10-01 23:02 Richard Yao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox