Date: Sat, 2 Jun 2012 18:27:14 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r236461 - in stable/8/tools/tools: ath/common termcap zfsboottest Message-ID: <201206021827.q52IREKm005278@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Sat Jun 2 18:27:14 2012 New Revision: 236461 URL: http://svn.freebsd.org/changeset/base/236461 Log: MFC r235129: zfsboottest.sh: gracefully handle default value of bootfs property 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:26:05 2012 (r236460) +++ stable/8/tools/tools/zfsboottest/zfsboottest.sh Sat Jun 2 18:27:14 2012 (r236461) @@ -52,8 +52,7 @@ if [ $? -ne 0 ]; then fi bootfs=`zpool get bootfs "${pool}" | tail -1 | awk '{print $3}'` if [ "${bootfs}" = "-" ]; then - echo "The \"bootfs\" property is not configured for pool \"${pool}\"." >&2 - exit 1 + bootfs="${pool}" fi # Dataset's mountpoint property should be set to 'legacy'. if [ "`zfs get -H -o value mountpoint ${bootfs}`" != "legacy" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206021827.q52IREKm005278>