d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pxe device in lsdev really include device name, looking like this:

Browse Source 
pxe0:    192.168.3.1:/storage/nfsroot/amd64
, instead of confusing and less useful:
      192.168.3.1:pxeboot
This commit is contained in:
mav 2012-09-12 21:00:37 +00:00
parent 3cc562d0f7
commit b1b3e5df41
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/boot/i386/libi386/pxe.c
View File

@ -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

9
sys/boot/i386/libi386/pxe.h
View File

@ -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 {