[src/trunk]: src/etc/rc.d Attempt to load the zfs module even if /etc/zfs/zpo...

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

details:   https://anonhg.NetBSD.org/src/rev/c19fc6c0f1d9
branches:  trunk
changeset: 846809:c19fc6c0f1d9
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Dec 01 21:00:43 2019 +0000

description:
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.

diffstat:

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

diffs (20 lines):

diff -r c0e0e442ddfd -r c19fc6c0f1d9 etc/rc.d/zfs
--- a/etc/rc.d/zfs      Sun Dec 01 20:56:39 2019 +0000
+++ b/etc/rc.d/zfs      Sun Dec 01 21:00:43 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: zfs,v 1.1 2019/09/15 19:38:09 brad Exp $
+# $NetBSD: zfs,v 1.2 2019/12/01 21:00:43 jmcneill Exp $
 #
 
 # PROVIDE: zfs
@@ -15,7 +15,7 @@
 
 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