Made '?' do the same thing as help.

Fixed bug in netmask command.
Loads kernel fine.  I'm trying to get locore/autoconf to like the stuff.

2 files changed, 9 insertions, 5 deletions

diff --git a/sys/i386/boot/netboot/bootmenu.c b/sys/i386/boot/netboot/bootmenu.c
index 7313dc7..c4b7a4d 100644
--- a/sys/i386/boot/netboot/bootmenu.c
+++ b/sys/i386/boot/netboot/bootmenu.c
@@ -35,6 +35,7 @@ struct bootcmds_t {
 	int (*func)();
 	char *help;
 } bootcmds[] = {
+	{"?",		cmd_help,	"              this list"},
 	{"help",	cmd_help,	"              this list"},
 	{"ip",		cmd_ip,		"<addr>          set my IP addr"},
 	{"server",	cmd_server,	"<addr>      set TFTP server IP addr"},
@@ -98,8 +99,7 @@ cmd_netmask(p)
 	int i;
 	if (!setip(p, &netmask)) {
 		netmask = ntohl(netmask);
-		printf("netmask is %I\r\n",
-			arptable[ARP_SERVER].ipaddr);
+		printf("netmask is %I\r\n", netmask);
 	}
 	netmask = htonl(netmask);
 }
diff --git a/sys/i386/boot/netboot/main.c b/sys/i386/boot/netboot/main.c
index 35a2248..55a39a0 100644
--- a/sys/i386/boot/netboot/main.c
+++ b/sys/i386/boot/netboot/main.c
@@ -93,11 +93,15 @@ load()
 		arptable[ARP_SERVER].ipaddr);
 
 		/* Now use TFTP to load configuration file */
-	sprintf(cfg,"/tftpboot/cfg.%I",arptable[ARP_CLIENT].ipaddr);
+	sprintf(cfg,"cfg.%I",arptable[ARP_CLIENT].ipaddr);
 	printf("Loading %s...\r\n",cfg);
 	if (!tftp(cfg)) {
-		printf("Unable to load config file.\r\n");
-		longjmp(jmp_bootmenu,1);
+		sprintf(cfg,"/tftpboot/cfg.%I",arptable[ARP_CLIENT].ipaddr);
+		printf("Loading %s...\r\n",cfg);
+		if (!tftp(cfg)) {
+			printf("Unable to load config file.\r\n");
+			longjmp(jmp_bootmenu,1);
+		}
 	}
 		/* Execute commands in config file */
 	p = config_buffer;