summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-12-08 14:42:01 +0000
committermartin <martin@NetBSD.org>2019-12-08 14:42:01 +0000
commitf2f2abe920153d8d1dfa1e8d49a330bc5e7a6f28 (patch)
treeb4991078e90f6e807df6f076b8a0f3ccd484c32a /etc
parentb14443a5f9ac27f0703f8db770cd6edf18a6ed74 (diff)
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 (limited to 'etc')
-rw-r--r--etc/rc.d/zfs5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/rc.d/zfs b/etc/rc.d/zfs
index 8e1bd69a894..01879e75f10 100644
--- a/etc/rc.d/zfs
+++ b/etc/rc.d/zfs
@@ -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