From owner-svn-src-all@FreeBSD.ORG  Mon Nov  2 16:49:57 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 59BC91065694;
	Mon,  2 Nov 2009 16:49:57 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4712A8FC17;
	Mon,  2 Nov 2009 16:49:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA2Gnvr5063382;
	Mon, 2 Nov 2009 16:49:57 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA2GnvkY063380;
	Mon, 2 Nov 2009 16:49:57 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200911021649.nA2GnvkY063380@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 2 Nov 2009 16:49:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198808 - in stable/6/sys: . boot/i386/libi386 conf
	contrib/pf dev/cxgb
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Nov 2009 16:49:57 -0000

Author: emaste
Date: Mon Nov  2 16:49:57 2009
New Revision: 198808
URL: http://svn.freebsd.org/changeset/base/198808

Log:
  MFC r197082:
  
    If the pxe client is told to use / as the root path, honour that rather
    of trying to mount /pxeroot instead.
  
  PR:		i386/106493
  Submitted by:	Andrey Russev

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/boot/i386/libi386/pxe.c
  stable/6/sys/conf/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/libi386/pxe.c
==============================================================================
--- stable/6/sys/boot/i386/libi386/pxe.c	Mon Nov  2 16:46:53 2009	(r198807)
+++ stable/6/sys/boot/i386/libi386/pxe.c	Mon Nov  2 16:49:57 2009	(r198808)
@@ -282,7 +282,7 @@ pxe_open(struct open_file *f, ...)
 		bootp(pxe_sock, BOOTP_PXE);
 		if (rootip.s_addr == 0)
 			rootip.s_addr = bootplayer.sip;
-		if (!rootpath[1])
+		if (!rootpath[0])
 			strcpy(rootpath, PXENFSROOTPATH);
 
 		for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++)