svn commit: r236459 - stable/9/tools/tools/zfsboottest

Andriy Gapon avg at FreeBSD.org
Sat Jun 2 18:24:44 UTC 2012


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


More information about the svn-src-all mailing list