diff options
| -rw-r--r-- | sys/pc98/boot/netboot/bootmenu.c | 25 | ||||
| -rw-r--r-- | sys/pc98/boot/netboot/main.c | 16 |
2 files changed, 21 insertions, 20 deletions
diff --git a/sys/pc98/boot/netboot/bootmenu.c b/sys/pc98/boot/netboot/bootmenu.c index 74e7e96..4ec2106 100644 --- a/sys/pc98/boot/netboot/bootmenu.c +++ b/sys/pc98/boot/netboot/bootmenu.c @@ -184,17 +184,22 @@ CMD_SWAPFS - Set swap filesystem name cmd_swapfs(p) char *p; { - if (!setip(p, &arptable[ARP_SWAPSERVER].ipaddr)) { + if (*p == '/') { + bcopy(&arptable[ARP_SERVER].ipaddr, + &arptable[ARP_SWAPSERVER].ipaddr, 4); + } else if (!setip(p, &arptable[ARP_SWAPSERVER].ipaddr)) { printf("Swap filesystem is %I:%s\n", nfsdiskless.swap_saddr.sin_addr, nfsdiskless.swap_hostnam); + return; } else { - bcopy(&arptable[ARP_SWAPSERVER].ipaddr, - &nfsdiskless.swap_saddr.sin_addr, 4); while (*p && (*p != ':')) p++; if (*p == ':') p++; - sprintf(&nfsdiskless.swap_hostnam, "%s", p); } + + bcopy(&arptable[ARP_SWAPSERVER].ipaddr, + &nfsdiskless.swap_saddr.sin_addr, 4); + sprintf(&nfsdiskless.swap_hostnam, "%s", p); } /************************************************************************** @@ -333,6 +338,18 @@ bootmenu() { char cmd[80]; int ptr, c; +#ifdef SECURE_BOOT + char *p; + + printf("\n"); + + printf("Press any key to retry:"); + while (iskey()) + getchar(); + getchar(); + printf("\n"); + eth_probe(); +#else printf("\n"); while (1) { ptr = 0; diff --git a/sys/pc98/boot/netboot/main.c b/sys/pc98/boot/netboot/main.c index da07cca..8799052 100644 --- a/sys/pc98/boot/netboot/main.c +++ b/sys/pc98/boot/netboot/main.c @@ -685,22 +685,6 @@ decode_rfc1048(p) case 141: bootp_string("", p); break; - case RFC1048_ROOT_PATH: /* XXX check len */ - bootp_string("rootfs", p); - break; - case RFC1048_SWAP_PATH: - bootp_string("swapfs", p); - break; - case RFC1048_SWAP_LEN: /* T129 */ - sprintf(config_buffer+strlen(config_buffer), - "swapsize %d\n", ntohl(*(long *)(p+2)) ); - break; - case 130: /* root mount options */ - bootp_string("rootopts", p); - break; - case 131: /* swap mount options */ - bootp_string("swapopts", p); - break; default: printf("Unknown RFC1048-tag "); for(q=p;q<p+2+TAG_LEN(p);q++) |
