Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc Enable critical_filesystems_zfs.



details:   https://anonhg.NetBSD.org/src/rev/e86e3ba14f99
branches:  trunk
changeset: 361981:e86e3ba14f99
user:      alnsn <alnsn%NetBSD.org@localhost>
date:      Sun Feb 20 14:42:07 2022 +0000

description:
Enable critical_filesystems_zfs.

diffstat:

 etc/defaults/rc.conf    |  3 ++-
 etc/rc.d/mountcritlocal |  6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 8d847c8690fb -r e86e3ba14f99 etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Sun Feb 20 10:49:17 2022 +0000
+++ b/etc/defaults/rc.conf      Sun Feb 20 14:42:07 2022 +0000
@@ -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 @@
 #
 critical_filesystems_local="OPTIONAL:/var"
 critical_filesystems_remote="OPTIONAL:/usr"
+critical_filesystems_zfs=""
 
 # Swap device controls.
 #
diff -r 8d847c8690fb -r e86e3ba14f99 etc/rc.d/mountcritlocal
--- a/etc/rc.d/mountcritlocal   Sun Feb 20 10:49:17 2022 +0000
+++ b/etc/rc.d/mountcritlocal   Sun Feb 20 14:42:07 2022 +0000
@@ -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 @@
        #       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"



Home | Main Index | Thread Index | Old Index