Author: avg
Date: Sat Jun 2 18:26:05 2012
New Revision: 236460
URL: http://svn.freebsd.org/changeset/base/236460
Log:
MFC r235130: zfsboottest.sh: correctly check and suggest value of
vfs.root.mountfrom
Modified:
stable/9/tools/tools/zfsboottest/zfsboottest.sh
Directory Properties:
stable/9/tools/tools/ (props changed)
stable/9/tools/tools/nanobsd/ (props changed)
stable/9/tools/tools/zfsboottest/ (props changed)
Modified: stable/9/tools/tools/zfsboottest/zfsboottest.sh
==============================================================================
--- stable/9/tools/tools/zfsboottest/zfsboottest.sh Sat Jun 2 18:24:43
2012 (r236459)
+++ stable/9/tools/tools/zfsboottest/zfsboottest.sh Sat Jun 2 18:26:05
2012 (r236460)
@@ -72,11 +72,11 @@ fi
# or vfs.root.mountfrom variable set in /boot/loader.conf.
egrep -q '^'"${bootfs}"'[[:space:]]+/[[:space:]]+zfs[[:space:]]+'
"${mountpoint}/etc/fstab" 2>/dev/null
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
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 "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
exit 1
fi
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
