summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartijn van Duren <martijn@cvs.openbsd.org>2016-11-26 16:31:33 +0000
committerMartijn van Duren <martijn@cvs.openbsd.org>2016-11-26 16:31:33 +0000
commit177addc2dd991c687716d101849170be403dbe1f (patch)
tree919c5000541a2f184d64c563b0df8b35e39156ec /sys
parent518fc282c67a44b0a9e2ad40ae464e8be6410f13 (diff)
Allow rootdev to be specified without /dev/ prefix. The full path isn't
needed down the road anyway. Both forms are supported. e.g. rootdev=/dev/sd0 and rootdev=sd0 OK visa@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/octeon/octeon/autoconf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/octeon/octeon/autoconf.c b/sys/arch/octeon/octeon/autoconf.c
index fe6084d7bc6..7b4434c2449 100644
--- a/sys/arch/octeon/octeon/autoconf.c
+++ b/sys/arch/octeon/octeon/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.8 2016/05/18 01:21:40 visa Exp $ */
+/* $OpenBSD: autoconf.c,v 1.9 2016/11/26 16:31:32 martijn Exp $ */
/*
* Copyright (c) 2009 Miodrag Vallat.
*
@@ -89,7 +89,9 @@ parse_uboot_root(void)
*/
p = strrchr(uboot_rootdev, '/');
if (p == NULL)
- return;
+ p = strchr(uboot_rootdev, '=');
+ if (p == NULL)
+ return;
p++;
len = strlen(p);