svn commit: r211553 - head/sys/cddl/compat/opensolaris/kern

[Martin Matuska]

I agree with Pawel, we should use "FreeBSD".
Is this (+ the dtrace test) going to be changed + set for MFC?

Dňa 28.08.2010 19:27, Pawel Jakub Dawidek  wrote / napísal(a):
> 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
>>
>> Log:
>>   Add sysname to struct opensolaris_utsname. This is needed by one DTrace
>>   test.
>>   
>>   Sponsored by:	The FreeBSD Foundation
>>
>> Modified:
>>   head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
>>
>> Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
>> ==============================================================================
>> --- head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c	Sat Aug 21 11:33:49 2010	(r211552)
>> +++ head/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c	Sat Aug 21 11:41:32 2010	(r211553)
>> @@ -38,7 +38,8 @@ __FBSDID("$FreeBSD$");
>>  char hw_serial[11] = "0";
>>  
>>  struct opensolaris_utsname utsname = {
>> -	.nodename = "unset"
>> +	.nodename = "unset",
>> +	.sysname  = "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?
>