Author: avg
Date: Sat Jun 2 18:29:16 2012
New Revision: 236463
URL: http://svn.freebsd.org/changeset/base/236463
Log:
MFC r235130: zfsboottest.sh: correctly check and suggest value of
vfs.root.mountfrom
Modified:
stable/8/tools/tools/zfsboottest/zfsboottest.sh
Directory Properties:
stable/8/tools/tools/ (props changed)
stable/8/tools/tools/aac/ (props changed)
stable/8/tools/tools/ath/ (props changed)
stable/8/tools/tools/ath/common/dumpregs.h (props changed)
stable/8/tools/tools/ath/common/dumpregs_5210.c (props changed)
stable/8/tools/tools/ath/common/dumpregs_5211.c (props changed)
stable/8/tools/tools/ath/common/dumpregs_5212.c (props changed)
stable/8/tools/tools/ath/common/dumpregs_5416.c (props changed)
stable/8/tools/tools/cfi/ (props changed)
stable/8/tools/tools/ether_reflect/ (props changed)
stable/8/tools/tools/iwi/ (props changed)
stable/8/tools/tools/mctest/ (props changed)
stable/8/tools/tools/nanobsd/ (props changed)
stable/8/tools/tools/netrate/ (props changed)
stable/8/tools/tools/netrate/netblast/ (props changed)
stable/8/tools/tools/netrate/netsend/ (props changed)
stable/8/tools/tools/netrate/tcpp/ (props changed)
stable/8/tools/tools/termcap/termcap.pl (props changed)
stable/8/tools/tools/umastat/ (props changed)
stable/8/tools/tools/vimage/ (props changed)
Modified: stable/8/tools/tools/zfsboottest/zfsboottest.sh
==============================================================================
--- stable/8/tools/tools/zfsboottest/zfsboottest.sh Sat Jun 2 18:28:34
2012 (r236462)
+++ stable/8/tools/tools/zfsboottest/zfsboottest.sh Sat Jun 2 18:29:16
2012 (r236463)
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
