Module Name: src
Committed By: alnsn
Date: Sun Feb 20 14:42:08 UTC 2022
Modified Files:
src/etc/defaults: rc.conf
src/etc/rc.d: mountcritlocal
Log Message:
Enable critical_filesystems_zfs.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/etc/defaults/rc.conf
cvs rdiff -u -r1.16 -r1.17 src/etc/rc.d/mountcritlocal
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.161 src/etc/defaults/rc.conf:1.162
--- src/etc/defaults/rc.conf:1.161 Sun Jan 10 23:24:25 2021
+++ src/etc/defaults/rc.conf Sun Feb 20 14:42:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.161 2021/01/10 23:24:25 riastradh Exp $
+# $NetBSD: rc.conf,v 1.162 2022/02/20 14:42:07 alnsn Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -92,6 +92,7 @@ domainname=""
#
critical_filesystems_local="OPTIONAL:/var"
critical_filesystems_remote="OPTIONAL:/usr"
+critical_filesystems_zfs=""
# Swap device controls.
#
Index: src/etc/rc.d/mountcritlocal
diff -u src/etc/rc.d/mountcritlocal:1.16 src/etc/rc.d/mountcritlocal:1.17
--- src/etc/rc.d/mountcritlocal:1.16 Wed Jul 22 16:50:41 2020
+++ src/etc/rc.d/mountcritlocal Sun Feb 20 14:42:07 2022
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritlocal,v 1.16 2020/07/22 16:50:41 martin Exp $
+# $NetBSD: mountcritlocal,v 1.17 2022/02/20 14:42:07 alnsn Exp $
#
# PROVIDE: mountcritlocal
@@ -19,8 +19,12 @@ mountcritlocal_start()
# This usually includes /var.
#
mount_critical_filesystems local || return $?
+ if checkyesno zfs; then
+ mount_critical_filesystems_zfs || return $?
+ fi
return 0
}
load_rc_config $name
+load_rc_config_var zfs zfs
run_rc_command "$1"
