From owner-svn-src-head@FreeBSD.ORG  Mon May  7 15:03:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A5AC9106566B;
	Mon,  7 May 2012 15:03:42 +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 90E4B8FC08;
	Mon,  7 May 2012 15:03:42 +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 q47F3goN070126;
	Mon, 7 May 2012 15:03:42 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q47F3gsa070124;
	Mon, 7 May 2012 15:03:42 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201205071503.q47F3gsa070124@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 7 May 2012 15:03:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235129 - head/tools/tools/zfsboottest
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 May 2012 15:03:42 -0000

Author: avg
Date: Mon May  7 15:03:42 2012
New Revision: 235129
URL: http://svn.freebsd.org/changeset/base/235129

Log:
  zfsboottest.sh: gracefully handle default value of bootfs property
  
  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 14:07:13 2012	(r235128)
+++ head/tools/tools/zfsboottest/zfsboottest.sh	Mon May  7 15:03:42 2012	(r235129)
@@ -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