Module Name: src
Committed By: gsutre
Date: Mon Sep 19 10:03:32 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
PR/38356: Minoura Makoto: Use the device's unit (instead of autoconf's)
to match the bootinfo root device.
Fixes multiboot(8) root= option as well as GRUB knetbsd --root option.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/x86/x86_autoconf.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/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.60 src/sys/arch/x86/x86/x86_autoconf.c:1.61
--- src/sys/arch/x86/x86/x86_autoconf.c:1.60 Sat Jul 2 13:09:31 2011
+++ src/sys/arch/x86/x86/x86_autoconf.c Mon Sep 19 10:03:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.61 2011/09/19 10:03:32 gsutre Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.61 2011/09/19 10:03:32 gsutre Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -442,7 +442,7 @@
len = strlen(cd->cf_name);
if (strncmp(cd->cf_name, biv->devname, len) == 0 &&
- biv->devname[len] - '0' == cd->cf_unit) {
+ biv->devname[len] - '0' == device_unit(dv)) {
handle_wedges(dv, biv->devname[len + 1] - 'a');
break;
}
