Author: cy
Date: Thu Aug 27 14:33:46 2020
New Revision: 364867
URL: https://svnweb.freebsd.org/changeset/base/364867
Log:
/etc/zfs/zpool.cache is the preferred (and new) location of zpool.cache.
Check for it first. Only use /boot/zfs/zpool.cache if the /etc/zfs
version is not found and good.
Reported by: avg
Suggested by: avg, kevans
Modified:
head/libexec/rc/rc.d/zpool
Modified: head/libexec/rc/rc.d/zpool
==============================================================================
--- head/libexec/rc/rc.d/zpool Thu Aug 27 14:29:06 2020 (r364866)
+++ head/libexec/rc/rc.d/zpool Thu Aug 27 14:33:46 2020 (r364867)
@@ -20,9 +20,9 @@ zpool_start()
{
local cachefile
- for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
+ for cachefile in /etc/zfs/zpool.cache /boot/zfs/zpool.cache; do
if [ -r $cachefile ]; then
- zpool import -c $cachefile -a -N
+ zpool import -c $cachefile -a -N && break
fi
done
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
