Module Name:    src
Committed By:   jmcneill
Date:           Sun Dec  1 21:00:43 UTC 2019

Modified Files:
        src/etc/rc.d: zfs

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/zfs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/zfs
diff -u src/etc/rc.d/zfs:1.1 src/etc/rc.d/zfs:1.2
--- src/etc/rc.d/zfs:1.1	Sun Sep 15 19:38:09 2019
+++ src/etc/rc.d/zfs	Sun Dec  1 21:00:43 2019
@@ -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 @@ 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

Reply via email to