Attachment 220145 Details for Bug 242189 – Add root_hold_wait to zpool, zfs, zfsbe, dumpon

[patch] Add root_hold_wait to zpool, zfs, zfsbe, dumpon

zfs_hold_wait.diff (text/plain), 1.44 KB, created by Oleg Sidorkin on 2020-12-01 20:39:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sidorkin

Created: 2020-12-01 20:39:35 UTC

Size: 1.44 KB

patch

obsolete

>Index: libexec/rc/rc.d/dumpon
>===================================================================
>--- libexec/rc/rc.d/dumpon	(revision 368259)
>+++ libexec/rc/rc.d/dumpon	(working copy)
>@@ -42,6 +42,7 @@
> 	[Nn][Oo] | '')
> 		;;
> 	[Aa][Uu][Tt][Oo])
>+		root_hold_wait
> 		dev=$(/bin/kenv -q dumpdev)
> 		if [ -n "${dev}" ] ; then
> 			dumpon_try "${dev}"
>@@ -56,6 +57,7 @@
> 		return 1
> 		;;
> 	*)
>+		root_hold_wait
> 		dumpon_try "${dumpdev}"
> 		;;
> 	esac
>Index: libexec/rc/rc.d/zfs
>===================================================================
>--- libexec/rc/rc.d/zfs	(revision 368259)
>+++ libexec/rc/rc.d/zfs	(working copy)
>@@ -25,6 +25,7 @@
> 
> zfs_start_main()
> {
>+	root_hold_wait
> 	zfs mount -va
> 	zfs share -a
> 	if [ ! -r /etc/zfs/exports ]; then
>Index: libexec/rc/rc.d/zfsbe
>===================================================================
>--- libexec/rc/rc.d/zfsbe	(revision 368259)
>+++ libexec/rc/rc.d/zfsbe	(working copy)
>@@ -68,6 +68,7 @@
> 	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
> 		:
> 	else
>+		root_hold_wait
> 		mount -p | while read _dev _mp _type _rest; do
> 			[ $_mp  = "/" ] || continue
> 			if [ $_type = "zfs" ] ; then
>Index: libexec/rc/rc.d/zpool
>===================================================================
>--- libexec/rc/rc.d/zpool	(revision 368259)
>+++ libexec/rc/rc.d/zpool	(working copy)
>@@ -18,6 +18,7 @@
> 
> zpool_start()
> {
>+	root_hold_wait
> 	local cachefile
> 
> 	for cachefile in /etc/zfs/zpool.cache /boot/zfs/zpool.cache; do

Actions: View | Diff

Attachments on bug 242189: 220145 | 221677 | 221678 | 222983