From owner-p4-projects@FreeBSD.ORG  Thu May  7 03:37:07 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CFEA4106566C; Thu,  7 May 2009 03:37:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CB5C1065673
	for <perforce@freebsd.org>; Thu,  7 May 2009 03:37:06 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B98D8FC21
	for <perforce@freebsd.org>; Thu,  7 May 2009 03:37:06 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n473b6Se092843
	for <perforce@freebsd.org>; Thu, 7 May 2009 03:37:06 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n473b6Mm092841
	for perforce@freebsd.org; Thu, 7 May 2009 03:37:06 GMT
	(envelope-from zec@fer.hr)
Date: Thu, 7 May 2009 03:37:06 GMT
Message-Id: <200905070337.n473b6Mm092841@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161706 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 03:37:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=161706

Change 161706 by zec@zec_tpx32 on 2009/05/07 03:36:42

	Instead of using a static initializer, set utsname.nodename
	in modevent handler, so that it could operate correctly for
	options VIMAGE builds.

Affected files ...

.. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 edit
.. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#6 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 (text+ko) ====

@@ -32,8 +32,10 @@
 #include <sys/cpuvar.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/misc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
+#include <sys/vimage.h>
 
 cpu_core_t	cpu_core[MAXCPU];
 kmutex_t	cpu_lock;
@@ -81,6 +83,7 @@
 
 	switch (type) {
 	case MOD_LOAD:
+		utsname.nodename = G_hostname;
 		break;
 
 	case MOD_UNLOAD:

==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#6 (text+ko) ====

@@ -33,16 +33,11 @@
 #include <sys/limits.h>
 #include <sys/misc.h>
 #include <sys/sunddi.h>
-#include <sys/vimage.h>
 
 char hw_serial[11] = "0";
 
 struct opensolaris_utsname utsname = {
-#ifdef VIMAGE
-	.nodename = "XXX"	/* XXX Marko FIXME!!! */
-#else
-	.nodename = G_hostname
-#endif
+	.nodename = "unset"
 };
 
 int