Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix something that never should have worked before, that got broken by 

proplib change.  I'm assuming it was wierdness in the devprop API.
This commit is contained in:
garbled 2006-05-08 23:12:13 +00:00
parent 64c2ef1711
commit e7b3b846b3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/prep/prep/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.15 2006/05/05 18:04:42 thorpej Exp $ */
/* $NetBSD: autoconf.c,v 1.16 2006/05/08 23:12:13 garbled Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2006/05/05 18:04:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2006/05/08 23:12:13 garbled Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -243,6 +243,7 @@ findroot(void)
struct device *d;
char *cp;
prop_string_t str;
size_t len;
/* first trim the ethernet crap off the bootpath */
cp = strchr(bootpath, ':');
@ -250,13 +251,20 @@ findroot(void)
cp++;
*cp = '\0';
}
len = strlen(bootpath);
#if defined(NVRAM_DUMP)
printf("Modified bootpath: %s\n", bootpath);
#endif
TAILQ_FOREACH(d, &alldevs, dv_list) {
str = prop_dictionary_get(device_properties(d), "fw-path");
if (str == NULL)
continue;
#if defined(NVRAM_DUMP)
printf("dev %s: fw-path: %s\n", d->dv_xname,
prop_string_cstring_nocopy(str));
#endif
if (strncmp(prop_string_cstring_nocopy(str), bootpath,
prop_string_size(str)) == 0) {
len) == 0) {
booted_device = d;
booted_partition = 0; /* XXX ??? */
return;