summaryrefslogtreecommitdiff
path: root/sys/arch/usermode/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2012-01-15 10:18:58 +0000
committerjmcneill <jmcneill@NetBSD.org>2012-01-15 10:18:58 +0000
commit4e14d40db3f56c1b92d8d8525df3e9e150fcb00d (patch)
tree2b58232368b479871d1aebf349d1e070a6a13873 /sys/arch/usermode/dev
parent565497c8f2a2ff1359472dbd6de50aaad9a0eb01 (diff)
allow specifing the root device with 'root=ldN' parameter
Diffstat (limited to 'sys/arch/usermode/dev')
-rw-r--r--sys/arch/usermode/dev/cpu.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/arch/usermode/dev/cpu.c b/sys/arch/usermode/dev/cpu.c
index 0e60cc69d31..1628b4e0702 100644
--- a/sys/arch/usermode/dev/cpu.c
+++ b/sys/arch/usermode/dev/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.65 2012/01/14 21:45:28 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.66 2012/01/15 10:18:58 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_hz.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.65 2012/01/14 21:45:28 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66 2012/01/15 10:18:58 jmcneill Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -380,11 +380,16 @@ cpu_startup(void)
void
cpu_rootconf(void)
{
+ extern char *usermode_root_device;
device_t rdev;
- rdev = device_find_by_xname("ld0");
- if (rdev == NULL)
- rdev = device_find_by_xname("md0");
+ if (usermode_root_device != NULL) {
+ rdev = device_find_by_xname(usermode_root_device);
+ } else {
+ rdev = device_find_by_xname("ld0");
+ if (rdev == NULL)
+ rdev = device_find_by_xname("md0");
+ }
aprint_normal("boot device: %s\n",
rdev ? device_xname(rdev) : "<unknown>");