aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/scripts
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2023-11-22 11:43:59 +0000
committerMartin Matuska <mm@FreeBSD.org>2023-11-22 11:43:59 +0000
commitf7f5c2419ea7e66460fe33bc6a5588842fd5312c (patch)
treed4c00729b739df53225287e60dc2569f8b771af9 /sys/contrib/openzfs/scripts
parent0c0d524e5e6cf5deafb24c6be2c3e6461272e055 (diff)
parent55dd24c4ccee2da61d5396289ef560f9b7bc6a68 (diff)
zfs: merge openzfs/zfs@55dd24c4c (zfs-2.2-release) into stable/14
OpenZFS release 2.2.1 Notable upstream pull request merges: #14378 6d693e20a Large sync writes perform worse with slog #15243 78fd79eac Add zfs_prepare_disk script for disk firmware install #15356 b76724ae4 FreeBSD: Improve taskq wrapper #15360 f9a9aea12 Add mutex_enter_interruptible() for interruptible sleeping IOCTLs #15371 e82e68400 DMU: Do not pre-read holes during write #15390 79f7de575 Remove lock from dsl_pool_need_dirty_delay() #15397 6e41aca51 Trust ARC_BUF_SHARED() more #15402 eaa62d995 Properly pad struct tx_cpu to cache line #15405 1cc1bf4fa Set spa_ccw_fail_time=0 when expanding a vdev #15416 edebca5df FreeBSD: taskq: Remove unused declaration #15451 7aef672b7 Read prefetched buffers from L2ARC #15452 bd7a02c25 Tune zio buffer caches and their alignments #15456 3ec4ea68d Unify arc_prune_async() code #15465 459c99ff2 Fix block cloning between unencrypted and encrypted datasets #15478 76663fe37 Fix accounting error for pending sync IO ops in zpool iostat #15529 87e9e8286 Add a tunable to disable BRT support Obtained from: OpenZFS OpenZFS commit: 55dd24c4ccee2da61d5396289ef560f9b7bc6a68 OpenZFS tag: zfs-2.2.1
Diffstat (limited to 'sys/contrib/openzfs/scripts')
-rw-r--r--sys/contrib/openzfs/scripts/Makefile.am2
-rwxr-xr-xsys/contrib/openzfs/scripts/zfs_prepare_disk17
2 files changed, 19 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/scripts/Makefile.am b/sys/contrib/openzfs/scripts/Makefile.am
index 95640727ac6a..b43bf97dbdf4 100644
--- a/sys/contrib/openzfs/scripts/Makefile.am
+++ b/sys/contrib/openzfs/scripts/Makefile.am
@@ -20,6 +20,8 @@ scripts_scripts = \
if CONFIG_USER
dist_scripts_SCRIPTS = $(scripts_scripts)
+dist_zfsexec_SCRIPTS = \
+ %D%/zfs_prepare_disk
else
dist_noinst_SCRIPTS += $(scripts_scripts)
endif
diff --git a/sys/contrib/openzfs/scripts/zfs_prepare_disk b/sys/contrib/openzfs/scripts/zfs_prepare_disk
new file mode 100755
index 000000000000..02aa9f8a7728
--- /dev/null
+++ b/sys/contrib/openzfs/scripts/zfs_prepare_disk
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# This is an optional helper script that is automatically called by libzfs
+# before a disk is about to be added into the pool. It can be modified by
+# the user to run whatever commands are necessary to prepare a disk for
+# inclusion into the pool. For example, users can add lines to this
+# script to do things like update the drive's firmware or check the drive's
+# health. The script is optional and can be removed if it is not needed.
+#
+# See the zfs_prepare_disk(8) man page for details.
+#
+# Example:
+#
+# echo "Prepare disk $VDEV_PATH ($VDEV_UPATH) for $VDEV_PREPARE in $POOL_NAME"
+#
+
+exit 0