From owner-svn-src-stable-8@FreeBSD.ORG Sat Jun 2 18:27:15 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A19C1065675; Sat, 2 Jun 2012 18:27:15 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D06E58FC1D; Sat, 2 Jun 2012 18:27:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q52IREDd005280; Sat, 2 Jun 2012 18:27:14 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q52IREKm005278; Sat, 2 Jun 2012 18:27:14 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201206021827.q52IREKm005278@svn.freebsd.org> From: Andriy Gapon Date: Sat, 2 Jun 2012 18:27:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236461 - in stable/8/tools/tools: ath/common termcap zfsboottest X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2012 18:27:15 -0000 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