[src/netbsd-9]: src/etc/rc.d Pull up following revision(s) (requested by jmcn...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2341f8becc3b
branches:  netbsd-9
changeset: 843634:2341f8becc3b
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 08 14:42:01 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #516):

        etc/rc.d/zfs: revision 1.2
        etc/rc.d/zfs: revision 1.3

Attempt to load the zfs module even if /etc/zfs/zpool.cache is absent. The
module needs to be loaded to create a pool in the first place, and
autoloading won't work after the fact won't work at securelevel=1.

Add missing rcvar=$name

diffstat:

 etc/rc.d/zfs |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r ca089fbd5dfb -r 2341f8becc3b etc/rc.d/zfs
--- a/etc/rc.d/zfs      Sun Dec 08 14:39:07 2019 +0000
+++ b/etc/rc.d/zfs      Sun Dec 08 14:42:01 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: zfs,v 1.1.2.2 2019/09/27 09:18:37 martin Exp $
+# $NetBSD: zfs,v 1.1.2.3 2019/12/08 14:42:01 martin Exp $
 #
 
 # PROVIDE: zfs
@@ -10,12 +10,13 @@
 $_rc_subr_loaded . /etc/rc.subr
 
 name="zfs"
+rcvar=$name
 start_cmd="zfs_start"
 stop_cmd="zfs_stop"
 
 zfs_start()
 {
-       if [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then
+       if [ -x /sbin/zfs ]; then
                # Get ZFS module loaded (and thereby, zvols created).
                /sbin/zfs list > /dev/null 2>&1
                if [ $? -ne 0 ]; then