View | Details | Raw Unified | Return to bug 256483
Collapse All | Expand All

(-)b/libexec/rc/rc.d/zfs (-1 / +7 lines)
Lines 25-31 zfs_start_jail() Link Here
25
25
26
zfs_start_main()
26
zfs_start_main()
27
{
27
{
28
	zfs mount -va
28
	if checkyesno "${zfs_mount_encrypted}"; then
29
		zfs mount -lav
30
	else
31
		zfs mount -va
32
	fi
29
	zfs share -a
33
	zfs share -a
30
	if [ ! -r /etc/zfs/exports ]; then
34
	if [ ! -r /etc/zfs/exports ]; then
31
		touch /etc/zfs/exports
35
		touch /etc/zfs/exports
Lines 64-67 zfs_stop() Link Here
64
}
68
}
65
69
66
load_rc_config $name
70
load_rc_config $name
71
: ${zfs_mount_encrypted:=no}
67
run_rc_command "$1"
72
run_rc_command "$1"
73
(-)b/share/man/man5/rc.conf.5 (+9 lines)
Lines 2007-2012 If set to Link Here
2007
.Pa /etc/rc.d/zfs
2007
.Pa /etc/rc.d/zfs
2008
will attempt to automatically mount ZFS file systems and initialize ZFS volumes
2008
will attempt to automatically mount ZFS file systems and initialize ZFS volumes
2009
(ZVOLs).
2009
(ZVOLs).
2010
.It Va zfs_mount_encrypted
2011
.Pq Vt bool
2012
If set to
2013
.Dq Li YES ,
2014
.Pa /etc/rc.d/zfs
2015
will attempt to automatically load keys for encrypted ZFS file systems and
2016
will include these encrypted file systems when mounting if
2017
.Pa zfs_enable
2018
is enabled.
2010
.It Va gptboot_enable
2019
.It Va gptboot_enable
2011
.Pq Vt bool
2020
.Pq Vt bool
2012
If set to
2021
If set to

Return to bug 256483