hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

/etc/zfs/zpool.cache is the preferred (and new) location of zpool.cache.

Browse Source 
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
This commit is contained in:
Cy Schubert 2020-08-27 14:33:46 +00:00
parent cd568e2b1b
commit a784185078
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364867
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/rc/rc.d/zpool
View File

@ -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
}