Date: Mon, 7 May 2012 15:06:07 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235130 - head/tools/tools/zfsboottest Message-ID: <201205071506.q47F67RW070238@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Mon May 7 15:06:07 2012 New Revision: 235130 URL: http://svn.freebsd.org/changeset/base/235130 Log: zfsboottest.sh: correctly check and suggest value of vfs.root.mountfrom ... it was missing "zfs:" prefix. Reported by: theraven MFC after: 10 days Modified: head/tools/tools/zfsboottest/zfsboottest.sh Modified: head/tools/tools/zfsboottest/zfsboottest.sh ============================================================================== --- head/tools/tools/zfsboottest/zfsboottest.sh Mon May 7 15:03:42 2012 (r235129) +++ head/tools/tools/zfsboottest/zfsboottest.sh Mon May 7 15:06:07 2012 (r235130) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205071506.q47F67RW070238>