Module Name: src
Committed By: manu
Date: Fri Sep 13 01:33:20 UTC 2019
Modified Files:
src/sys/kern: kern_subr.c
Log Message:
Accept root device specification as NAME=label
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/kern/kern_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.224 src/sys/kern/kern_subr.c:1.225
--- src/sys/kern/kern_subr.c:1.224 Sun Aug 18 06:28:42 2019
+++ src/sys/kern/kern_subr.c Fri Sep 13 01:33:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.224 2019/08/18 06:28:42 mlelstv Exp $ */
+/* $NetBSD: kern_subr.c,v 1.225 2019/09/13 01:33:20 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.224 2019/08/18 06:28:42 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.225 2019/09/13 01:33:20 manu Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -229,6 +229,16 @@ setroot(device_t bootdv, int bootpartiti
*/
setroot_nfs(bootdv);
+
+ /*
+ * Try to lookup by wedge label name
+ */
+ if (bootdv == NULL && rootspec != NULL &&
+ strncmp(rootspec, "NAME=", 5) == 0) {
+ if ((bootdv = dkwedge_find_by_wname(rootspec + 5)) != NULL)
+ rootspec = bootdv->dv_xname;
+ }
+
/*
* If no bootdv was found by MD code and no
* root specified ask the user.
