d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfsboottest.sh: correctly check and suggest value of vfs.root.mountfrom

Browse Source 
... it was missing "zfs:" prefix.

Reported by:	theraven
MFC after:	10 days
This commit is contained in:
Andriy Gapon 2012-05-07 15:06:07 +00:00
parent efeadeff78
commit 05795a78d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/tools/zfsboottest/zfsboottest.sh
View File

@ -72,11 +72,11 @@ fi
# or vfs.root.mountfrom variable set in /boot/loader.conf. # or vfs.root.mountfrom variable set in /boot/loader.conf.
egrep -q '^'"${bootfs}"'[[:space:]]+/[[:space:]]+zfs[[:space:]]+' "${mountpoint}/etc/fstab" 2>/dev/null egrep -q '^'"${bootfs}"'[[:space:]]+/[[:space:]]+zfs[[:space:]]+' "${mountpoint}/etc/fstab" 2>/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
egrep -q 'vfs.root.mountfrom="?'"${bootfs}"'"?[[:space:]]*$' "${mountpoint}/boot/loader.conf" 2>/dev/null egrep -q 'vfs.root.mountfrom="?'"zfs:${bootfs}"'"?[[:space:]]*$' "${mountpoint}/boot/loader.conf" 2>/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "To be able to boot from \"${bootfs}\", you need to declare" >&2 echo "To be able to boot from \"${bootfs}\", you need to declare" >&2
echo "\"${bootfs}\" as being root file system in ${mountpoint}/etc/fstab" >&2 echo "\"${bootfs}\" as being root file system in ${mountpoint}/etc/fstab" >&2
echo "or add \"vfs.root.mountfrom\" variable set to \"${bootfs}\" to" >&2 echo "or add \"vfs.root.mountfrom\" variable set to \"zfs:${bootfs}\" to" >&2
echo "${mountpoint}/boot/loader.conf." >&2 echo "${mountpoint}/boot/loader.conf." >&2
exit 1 exit 1
fi fi