summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-12-11 14:13:40 +0000
committermartin <martin@NetBSD.org>2019-12-11 14:13:40 +0000
commit1c01ac1ac6328ad6f3fd9588205d76d23e05ab7f (patch)
treed4365234455f9dcd06992163941ca0d231d365fd /etc
parent74bae853ae866703006063179f3d9e5fe948a77c (diff)
Pull up following revision(s) (requested by sevan in ticket #539):
etc/rc.d/zfs: revision 1.4 etc/rc.d/zfs: revision 1.5 We don't need to require the presence of /etc/zfs/zpool.cache to unmount & unload the module, just like for the start target. This script just makes sure that the ZFS module loads and unloads, mountall script takes care of mounting filesystems. Don't try to unmount all file systems before unloading the ZFS module, leave that to the operator in preperation or the mountall script to take care of. Module will of course fail to unload then if file systems are still mounted.
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/zfs5
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/rc.d/zfs b/etc/rc.d/zfs
index 01879e75f10..71c75185cc6 100644
--- a/etc/rc.d/zfs
+++ b/etc/rc.d/zfs
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: zfs,v 1.1.2.3 2019/12/08 14:42:01 martin Exp $
+# $NetBSD: zfs,v 1.1.2.4 2019/12/11 14:13:40 martin Exp $
#
# PROVIDE: zfs
@@ -28,8 +28,7 @@ zfs_start()
zfs_stop()
{
- if [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then
- zfs unmount -a
+ if [ -x /sbin/zfs ]; then
modunload zfs
fi
return 0;