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

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

details:   https://anonhg.NetBSD.org/src/rev/b91a07d30bf0
branches:  netbsd-9
changeset: 843659:b91a07d30bf0
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Dec 11 14:13:40 2019 +0000

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

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

diffs (21 lines):

diff -r 54775303fb44 -r b91a07d30bf0 etc/rc.d/zfs
--- a/etc/rc.d/zfs      Mon Dec 09 19:33:56 2019 +0000
+++ b/etc/rc.d/zfs      Wed Dec 11 14:13:40 2019 +0000
@@ -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_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;