diff options
| author | martin <martin@NetBSD.org> | 2020-02-25 20:03:12 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2020-02-25 20:03:12 +0000 |
| commit | 22a71e47e21d88d01cc955f3c6e64594d2d65e83 (patch) | |
| tree | 54cee0d0c6a06dba334b8292c2ed00acd526176b /etc | |
| parent | 923592e49befddd84e3729ea3a9d3960f3c18a91 (diff) | |
Pull up following revision(s) (requested by riastradh in ticket #725):
etc/rc.d/mountall: revision 1.12
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.59
external/cddl/osnet/sys/kern/misc.c: revision 1.8
external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c: revision 1.5
external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c: revision 1.6
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.60
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.61
Define VOP_STRATEGY on zfs device nodes too.
Fixes eternal hangs in attempts to do I/O on device nodes on zfs.
XXX pullup
Teach zfs spec nodes to VOP_BWRITE too.
Fixes hang on writing to, e.g., ffs mounted on a device node that
lives on zfs.
XXX pullup
Teach device nodes on zfs to handle fsync by calling spec_fsync too.
If zfs=YES, unconditioally do zfs mount/unmount -a.
If you set zfs=YES, presumably you positively want the automatic rc.d
actions, so if there's no /sbin/zfs or if zfs can't find pools with
/etc/zfs/zpool.cache, presumably you would like feedback about that
in rc.log.
Report the OS name and release appropriately for NetBSD.
We are not OpenSolaris or uts!
Mark previous #ifdef __NetBSD__, per request from hannken.
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/mountall | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/mountall b/etc/rc.d/mountall index 616c1ff11d0..f3cb4a27510 100755 --- a/etc/rc.d/mountall +++ b/etc/rc.d/mountall @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mountall,v 1.10.4.1 2019/09/27 09:18:37 martin Exp $ +# $NetBSD: mountall,v 1.10.4.2 2020/02/25 20:03:12 martin Exp $ # # REQUIRE: mountcritremote named ypbind @@ -17,7 +17,7 @@ mountall_start() echo 'Mounting all file systems...' # Mount file systems noted in fstab. mount -a - if checkyesno zfs && [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then + if checkyesno zfs; then # Mount ZFS file systems. zfs mount -a fi @@ -26,7 +26,7 @@ mountall_start() mountall_stop() { echo 'Unmounting all file systems...' - if checkyesno zfs && [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then + if checkyesno zfs; then # Unmount ZFS file systems. zfs unmount -a fi |
