Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

findroot(): set booted_device also when specifying a network device to bootdev. 

Useful for booting with root on nfs.
This commit is contained in:
cegger 2008-10-24 16:37:25 +00:00
parent 7f01a821b9
commit 5cbbf5c20d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/xen/x86/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.5 2008/10/24 16:26:07 cegger Exp $ */ /* $NetBSD: autoconf.c,v 1.6 2008/10/24 16:37:25 cegger Exp $ */
/* NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp */ /* NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp */
/*- /*-
@ -45,7 +45,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.5 2008/10/24 16:26:07 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.6 2008/10/24 16:37:25 cegger Exp $");
#include "opt_xen.h" #include "opt_xen.h"
#include "opt_compat_oldboot.h" #include "opt_compat_oldboot.h"
@ -189,21 +189,27 @@ findroot(void)
xen_parse_cmdline(XEN_PARSE_BOOTDEV, &xcp); xen_parse_cmdline(XEN_PARSE_BOOTDEV, &xcp);
TAILQ_FOREACH(dv, &alldevs, dv_list) { TAILQ_FOREACH(dv, &alldevs, dv_list) {
if (is_valid_disk(dv) == 0) bool is_ifnet, is_disk;
const char *devname;
is_ifnet = (device_class(dv) == DV_IFNET);
is_disk = is_valid_disk(dv);
devname = device_xname(dv);
if (!is_ifnet && !is_disk)
continue; continue;
if (xcp.xcp_bootdev[0] == 0) { if (is_disk && xcp.xcp_bootdev[0] == 0) {
handle_wedges(dv, 0); handle_wedges(dv, 0);
break; break;
} }
if (strncmp(xcp.xcp_bootdev, device_xname(dv), if (strncmp(xcp.xcp_bootdev, devname, strlen(devname)))
strlen(device_xname(dv))))
continue; continue;
if (strlen(xcp.xcp_bootdev) > strlen(device_xname(dv))) { if (is_disk && strlen(xcp.xcp_bootdev) > strlen(devname)) {
booted_partition = toupper( booted_partition = toupper(
xcp.xcp_bootdev[strlen(device_xname(dv))]) - 'A'; xcp.xcp_bootdev[strlen(devname)]) - 'A';
} }
booted_device = dv; booted_device = dv;