From owner-svn-src-head@FreeBSD.ORG  Wed Sep 12 21:00:38 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7406106567C;
	Wed, 12 Sep 2012 21:00:38 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 937A28FC08;
	Wed, 12 Sep 2012 21:00:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8CL0cQ2047222;
	Wed, 12 Sep 2012 21:00:38 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8CL0ca2047219;
	Wed, 12 Sep 2012 21:00:38 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201209122100.q8CL0ca2047219@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 12 Sep 2012 21:00:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240421 - head/sys/boot/i386/libi386
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Sep 2012 21:00:38 -0000

Author: mav
Date: Wed Sep 12 21:00:37 2012
New Revision: 240421
URL: http://svn.freebsd.org/changeset/base/240421

Log:
  Make pxe device in lsdev really include device name, looking like this:
      pxe0:    192.168.3.1:/storage/nfsroot/amd64
  , instead of confusing and less useful:
        192.168.3.1:pxeboot

Modified:
  head/sys/boot/i386/libi386/pxe.c
  head/sys/boot/i386/libi386/pxe.h

Modified: head/sys/boot/i386/libi386/pxe.c
==============================================================================
--- head/sys/boot/i386/libi386/pxe.c	Wed Sep 12 19:36:54 2012	(r240420)
+++ head/sys/boot/i386/libi386/pxe.c	Wed Sep 12 21:00:37 2012	(r240421)
@@ -355,18 +355,11 @@ pxe_close(struct open_file *f)
 static void
 pxe_print(int verbose)
 {
-	if (pxe_call != NULL) {
-		if (*bootplayer.Sname == '\0') {
-			printf("      "IP_STR":%s\n",
-			       IP_ARGS(htonl(bootplayer.sip)),
-			       bootplayer.bootfile);
-		} else {
-			printf("      %s:%s\n", bootplayer.Sname,
-			       bootplayer.bootfile);
-		}
-	}
 
-	return;
+	if (pxe_call == NULL)
+		return;
+
+	printf("    pxe0:    %s:%s\n", inet_ntoa(rootip), rootpath);
 }
 
 static void

Modified: head/sys/boot/i386/libi386/pxe.h
==============================================================================
--- head/sys/boot/i386/libi386/pxe.h	Wed Sep 12 19:36:54 2012	(r240420)
+++ head/sys/boot/i386/libi386/pxe.h	Wed Sep 12 21:00:37 2012	(r240421)
@@ -52,15 +52,6 @@
 
 #define	S_SIZE(s)	s, sizeof(s) - 1
 
-#define	IP_STR		"%d.%d.%d.%d"
-#define	IP_ARGS(ip)					\
-	(int)(ip >> 24) & 0xff, (int)(ip >> 16) & 0xff, \
-	(int)(ip >> 8) & 0xff, (int)ip & 0xff
-
-#define	MAC_STR		"%02x:%02x:%02x:%02x:%02x:%02x"
-#define	MAC_ARGS(mac)					\
-	mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] 
-
 #define	PXENFSROOTPATH	"/pxeroot"
 
 typedef struct {