[src/trunk]: src/sys/kern Accept root device specification as NAME=label

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a3e71e5b1d27
branches:  trunk
changeset: 454414:a3e71e5b1d27
user:      manu <manu%NetBSD.org@localhost>
date:      Mon Sep 16 00:01:16 2019 +0000

description:
Accept root device specification as NAME=label

diffstat:

 sys/kern/kern_subr.c |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 88f1a92a8f8b -r a3e71e5b1d27 sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Mon Sep 16 00:00:56 2019 +0000
+++ b/sys/kern/kern_subr.c      Mon Sep 16 00:01:16 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.226 2019/09/15 23:59:33 manu Exp $     */
+/*     $NetBSD: kern_subr.c,v 1.227 2019/09/16 00:01:16 manu Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.226 2019/09/15 23:59:33 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.227 2019/09/16 00:01:16 manu Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -691,13 +691,18 @@
 static const char *
 getwedgename(const char *name, int namelen)
 {
-       const char *wpfx = "wedge:";
-       const int wpfxlen = strlen(wpfx);
+       const char *wpfx1 = "wedge:";
+       const char *wpfx2 = "NAME=";
+       const int wpfx1len = strlen(wpfx1);
+       const int wpfx2len = strlen(wpfx2);
 
-       if (namelen < wpfxlen || strncmp(name, wpfx, wpfxlen) != 0)
-               return NULL;
+       if (namelen > wpfx1len && strncmp(name, wpfx1, wpfx1len) == 0)
+               return name + wpfx1len;
 
-       return name + wpfxlen;
+       if (namelen > wpfx2len && strncasecmp(name, wpfx2, wpfx2len) == 0)
+               return name + wpfx2len;
+
+       return NULL;
 }
 
 static device_t