Date: Wed, 12 Sep 2012 21:00:38 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r240421 - head/sys/boot/i386/libi386 Message-ID: <201209122100.q8CL0ca2047219@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209122100.q8CL0ca2047219>