Module Name: src
Committed By: riastradh
Date: Sun Feb 23 08:53:26 UTC 2020
Modified Files:
src/etc/rc.d: mountall
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/mountall
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/mountall
diff -u src/etc/rc.d/mountall:1.11 src/etc/rc.d/mountall:1.12
--- src/etc/rc.d/mountall:1.11 Sun Sep 15 19:38:09 2019
+++ src/etc/rc.d/mountall Sun Feb 23 08:53:25 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountall,v 1.11 2019/09/15 19:38:09 brad Exp $
+# $NetBSD: mountall,v 1.12 2020/02/23 08:53:25 riastradh 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
