Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Jun 2012 18:24:44 +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-9@freebsd.org
Subject:   svn commit: r236459 - stable/9/tools/tools/zfsboottest
Message-ID:  <201206021824.q52IOivm005051@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Sat Jun  2 18:24:43 2012
New Revision: 236459
URL: http://svn.freebsd.org/changeset/base/236459

Log:
  MFC r235129: zfsboottest.sh: gracefully handle default value of bootfs
  property

Modified:
  stable/9/tools/tools/zfsboottest/zfsboottest.sh
Directory Properties:
  stable/9/tools/tools/   (props changed)
  stable/9/tools/tools/nanobsd/   (props changed)
  stable/9/tools/tools/zfsboottest/   (props changed)

Modified: stable/9/tools/tools/zfsboottest/zfsboottest.sh
==============================================================================
--- stable/9/tools/tools/zfsboottest/zfsboottest.sh	Sat Jun  2 18:22:38 2012	(r236458)
+++ stable/9/tools/tools/zfsboottest/zfsboottest.sh	Sat Jun  2 18:24:43 2012	(r236459)
@@ -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?201206021824.q52IOivm005051>