From owner-svn-src-all@FreeBSD.ORG Tue May 8 02:03:03 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43493106566C; Tue, 8 May 2012 02:03:03 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id E3F458FC0A; Tue, 8 May 2012 02:03:02 +0000 (UTC) Received: from localhost (89-73-195-149.dynamic.chello.pl [89.73.195.149]) by mail.dawidek.net (Postfix) with ESMTPSA id 7C3C23C6; Tue, 8 May 2012 04:03:01 +0200 (CEST) Date: Tue, 8 May 2012 04:01:19 +0200 From: Pawel Jakub Dawidek To: Andriy Gapon Message-ID: <20120508020119.GE1395@garage.freebsd.pl> References: <201205071503.q47F3gsa070124@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Y1L3PTX8QE8cb2T+" Content-Disposition: inline In-Reply-To: <201205071503.q47F3gsa070124@svn.freebsd.org> X-OS: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r235129 - head/tools/tools/zfsboottest X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 May 2012 02:03:03 -0000 --Y1L3PTX8QE8cb2T+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 07, 2012 at 03:03:42PM +0000, Andriy Gapon wrote: > Author: avg > Date: Mon May 7 15:03:42 2012 > New Revision: 235129 > URL: http://svn.freebsd.org/changeset/base/235129 >=20 > Log: > zfsboottest.sh: gracefully handle default value of bootfs property I'd prefer if people avoid having their root file system at the pool level, so maybe we could leave it as a warning? > Reported by: theraven > MFC after: 10 days >=20 > Modified: > head/tools/tools/zfsboottest/zfsboottest.sh >=20 > Modified: head/tools/tools/zfsboottest/zfsboottest.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D`zpool get bootfs "${pool}" | tail -1 | awk '{print $3}'` > if [ "${bootfs}" =3D "-" ]; then > - echo "The \"bootfs\" property is not configured for pool \"${pool}\"." = >&2 > - exit 1 > + bootfs=3D"${pool}" > fi > # Dataset's mountpoint property should be set to 'legacy'. > if [ "`zfs get -H -o value mountpoint ${bootfs}`" !=3D "legacy" ]; then --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://tupytaj.pl --Y1L3PTX8QE8cb2T+ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAk+ofm8ACgkQForvXbEpPzQDLACgnjz6GeDb5q0bdTvCp1i0WhvA DwoAni3zFbA+hu8dQcK9DIrnzadImKCe =PPCn -----END PGP SIGNATURE----- --Y1L3PTX8QE8cb2T+--