From owner-p4-projects@FreeBSD.ORG  Wed Jun 11 23:58:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 583F61065677; Wed, 11 Jun 2008 23:58:37 +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 19F1C106566C
	for <perforce@freebsd.org>; Wed, 11 Jun 2008 23:58:37 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 03FC28FC15
	for <perforce@freebsd.org>; Wed, 11 Jun 2008 23:58:37 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5BNwa7p014551
	for <perforce@freebsd.org>; Wed, 11 Jun 2008 23:58:36 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5BNwab6014549
	for perforce@freebsd.org; Wed, 11 Jun 2008 23:58:36 GMT
	(envelope-from julian@freebsd.org)
Date: Wed, 11 Jun 2008 23:58:36 GMT
Message-Id: <200806112358.m5BNwab6014549@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143327 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: Wed, 11 Jun 2008 23:58:37 -0000

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

Change 143327 by julian@julian_trafmon1 on 2008/06/11 23:57:39

	two more files that shouldn't have been edited.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/boot/common/dev_net.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/pxe.c#3 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/boot/common/dev_net.c#3 (text+ko) ====

@@ -62,7 +62,6 @@
 #include <machine/stdarg.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/vimage.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -246,7 +245,7 @@
 	return (EIO);
     }
     if (debug)
-        printf("net_open: client name: %s\n", V_hostname);
+        printf("net_open: client name: %s\n", hostname);
 
     /*
      * Ignore the gateway from whoami (unreliable).

==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/pxe.c#3 (text+ko) ====

@@ -27,7 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-#include <sys/vimage.h>
 __FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $");
 
 #include <stand.h>
@@ -309,7 +308,7 @@
 		}
 		setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
 		setenv("boot.nfsroot.path", rootpath, 1);
-		setenv("dhcp.host-name", V_hostname, 1);
+		setenv("dhcp.host-name", hostname, 1);
 	}
     }
     pxe_opens++;