Date: Thu, 27 Aug 2020 14:33:47 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364867 - head/libexec/rc/rc.d Message-ID: <202008271433.07REXlqu058636@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008271433.07REXlqu058636>