D34601.diff
No OneTemporary
Actions

Size

665 B

Referenced Files

None

Subscribers

None

D34601.diff
View Options

	diff --git a/libexec/rc/rc.d/zfs b/libexec/rc/rc.d/zfs
	--- a/libexec/rc/rc.d/zfs
	+++ b/libexec/rc/rc.d/zfs
	@@ -13,6 +13,7 @@
	desc="Mount and share ZFS datasets"
	rcvar="zfs_enable"
	start_cmd="zfs_start"
	+start_postcmd="zfs_poststart"
	stop_cmd="zfs_stop"
	required_modules="zfs"

	@@ -41,6 +42,17 @@
	fi
	}

	+zfs_poststart()
	+{
	+ # Some of the keys to decrypt datasets are potentially stored on ZFS
	+ # datasets that just got mounted. Let's try to load those keys and
	+ # mount the datasets.
	+ if checkyesno zfskeys_enable; then
	+ /etc/rc.d/zfskeys start
	+ zfs_start
	+ fi
	+}
	+
	zfs_stop_jail()
	{
	if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then