Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Rollback change to accept NAME=label root device sp...



details:   https://anonhg.NetBSD.org/src/rev/df6def958829
branches:  trunk
changeset: 454412:df6def958829
user:      manu <manu%NetBSD.org@localhost>
date:      Sun Sep 15 23:59:33 2019 +0000

description:
Rollback change to accept NAME=label root device specification

As suggested by Michael van Elst, the operation should be done
int getwedgename()

diffstat:

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

diffs (35 lines):

diff -r 4c90afeb0fa4 -r df6def958829 sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Sun Sep 15 23:58:31 2019 +0000
+++ b/sys/kern/kern_subr.c      Sun Sep 15 23:59:33 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.225 2019/09/13 01:33:20 manu Exp $     */
+/*     $NetBSD: kern_subr.c,v 1.226 2019/09/15 23:59:33 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.225 2019/09/13 01:33:20 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.226 2019/09/15 23:59:33 manu Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -229,16 +229,6 @@
         */
        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.



Home | Main Index | Thread Index | Old Index