From owner-svn-src-all@FreeBSD.ORG Sat Aug 28 17:28:00 2010 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 98DBE10656A8; Sat, 28 Aug 2010 17:28:00 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id 2EFDD8FC0A; Sat, 28 Aug 2010 17:27:59 +0000 (UTC) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 63C3445EB2; Sat, 28 Aug 2010 19:27:57 +0200 (CEST) Received: from localhost (chello089077043238.chello.pl [89.77.43.238]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 3A7F145C99; Sat, 28 Aug 2010 19:27:52 +0200 (CEST) Date: Sat, 28 Aug 2010 19:27:44 +0200 From: Pawel Jakub Dawidek To: Rui Paulo Message-ID: <20100828172744.GJ2077@garage.freebsd.pl> References: <201008211141.o7LBfWdv067923@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="k1BdFSKqAqVdu8k/" Content-Disposition: inline In-Reply-To: <201008211141.o7LBfWdv067923@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 9.0-CURRENT amd64 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-0.6 required=4.5 tests=BAYES_00,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r211553 - head/sys/cddl/compat/opensolaris/kern 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: Sat, 28 Aug 2010 17:28:00 -0000 --k1BdFSKqAqVdu8k/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Aug 21, 2010 at 11:41:32AM +0000, Rui Paulo wrote: > Author: rpaulo > Date: Sat Aug 21 11:41:32 2010 > New Revision: 211553 > URL: http://svn.freebsd.org/changeset/base/211553 >=20 > Log: > Add sysname to struct opensolaris_utsname. This is needed by one DTrace > test. > =20 > Sponsored by: The FreeBSD Foundation >=20 > Modified: > head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c >=20 > Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c > =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/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c Sat Aug 21 1= 1:33:49 2010 (r211552) > +++ head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c Sat Aug 21 1= 1:41:32 2010 (r211553) > @@ -38,7 +38,8 @@ __FBSDID("$FreeBSD$"); > char hw_serial[11] =3D "0"; > =20 > struct opensolaris_utsname utsname =3D { > - .nodename =3D "unset" > + .nodename =3D "unset", > + .sysname =3D "SunOS" This collides with the changes I have in perforce. Could you take a look at: //depot/user/pjd/zfs/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c //depot/user/pjd/zfs/sys/cddl/compat/opensolaris/sys/misc.h I'd prefer sysname to say FreeBSD on FreeBSD, rather than SunOS. I see it is being used in one DTrace test. Changing 'tst.str.d.out' to expect "FreeBSD" instead of "SunOS" is ok? --=20 Pawel Jakub Dawidek http://www.wheelsystems.com pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --k1BdFSKqAqVdu8k/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkx5Rw8ACgkQForvXbEpPzQYdACeOAyXMTQ1ZBkLlacuyC7tJMw5 h3IAoNLl/v2YI/FFxGbemxssRdODiltB =pXCv -----END PGP SIGNATURE----- --k1BdFSKqAqVdu8k/--