From owner-p4-projects@FreeBSD.ORG  Sat Aug 16 09:24:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2C28F1065699; Sat, 16 Aug 2008 09:24:49 +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 ACFA0106567D
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 09:24:48 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FDAB8FC19
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 09:24:48 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G9OmLK080540
	for <perforce@freebsd.org>; Sat, 16 Aug 2008 09:24:48 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G9OmsN080538
	for perforce@freebsd.org; Sat, 16 Aug 2008 09:24:48 GMT
	(envelope-from zec@tel.fer.hr)
Date: Sat, 16 Aug 2008 09:24:48 GMT
Message-Id: <200808160924.m7G9OmsN080538@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147514 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: Sat, 16 Aug 2008 09:24:49 -0000

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

Change 147514 by zec@zec_tpx32 on 2008/08/16 09:24:39

	Fix more breakage following the opt_vimage.h -> opt_global.h
	change.

Affected files ...

.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#5 (text+ko) ====

@@ -41,6 +41,7 @@
 #include <sys/sbuf.h>
 #include <sys/systm.h>
 #include <sys/time.h>
+#include <sys/vimage.h>
 
 #include <geom/geom.h>
 #include <geom/vinum/geom_vinum_var.h>
@@ -63,7 +64,7 @@
 	vhdr->config_length = GV_CFG_LEN;
 
 	mtx_lock(&hostname_mtx);
-	bcopy(hostname, vhdr->label.sysname, GV_HOSTNAME_LEN);
+	bcopy(G_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN);
 	mtx_unlock(&hostname_mtx);
 	strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME);
 	microtime(&vhdr->label.date_of_birth);