Commit efdcea3e authored by Mike Hibler's avatar Mike Hibler

Change logging code to recognize newish TYPE_DISKPART.

parent e65ccc09
/* /*
* EMULAB-COPYRIGHT * EMULAB-COPYRIGHT
* Copyright (c) 2000-2010 University of Utah and the Flux Group. * Copyright (c) 2000-2012 University of Utah and the Flux Group.
* All rights reserved. * All rights reserved.
*/ */
...@@ -58,8 +58,9 @@ cleanup() ...@@ -58,8 +58,9 @@ cleanup()
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int sock, length, mlen, err, c; int sock, mlen, err, c;
struct sockaddr_in name, client; struct sockaddr_in name, client;
socklen_t length;
boot_info_t boot_info; boot_info_t boot_info;
int port = BOOTWHAT_DSTPORT; int port = BOOTWHAT_DSTPORT;
FILE *fp; FILE *fp;
...@@ -194,6 +195,11 @@ log_bootwhat(struct in_addr ipaddr, boot_what_t *bootinfo) ...@@ -194,6 +195,11 @@ log_bootwhat(struct in_addr ipaddr, boot_what_t *bootinfo)
info("%s: REPLY: boot from partition %d\n", info("%s: REPLY: boot from partition %d\n",
ipstr, bootinfo->what.partition); ipstr, bootinfo->what.partition);
break; break;
case BIBOOTWHAT_TYPE_DISKPART:
info("%s: REPLY: boot from disk/partition 0x%x/%d\n",
ipstr, bootinfo->what.dp.disk,
bootinfo->what.dp.partition);
break;
case BIBOOTWHAT_TYPE_SYSID: case BIBOOTWHAT_TYPE_SYSID:
info("%s: REPLY: boot from partition with sysid %d\n", info("%s: REPLY: boot from partition with sysid %d\n",
ipstr, bootinfo->what.sysid); ipstr, bootinfo->what.sysid);
...@@ -212,6 +218,9 @@ log_bootwhat(struct in_addr ipaddr, boot_what_t *bootinfo) ...@@ -212,6 +218,9 @@ log_bootwhat(struct in_addr ipaddr, boot_what_t *bootinfo)
case BIBOOTWHAT_TYPE_REBOOT: case BIBOOTWHAT_TYPE_REBOOT:
info("%s: REPLY: reboot (alternate PXE boot)\n", ipstr); info("%s: REPLY: reboot (alternate PXE boot)\n", ipstr);
break; break;
default:
info("%s: REPLY: UNKNOWN (type=%d)\n", ipstr, bootinfo->type);
break;
} }
if (bootinfo->cmdline[0]) { if (bootinfo->cmdline[0]) {
info("%s: REPLY: command line: %s\n", ipstr, bootinfo->cmdline); info("%s: REPLY: command line: %s\n", ipstr, bootinfo->cmdline);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment