diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-06-30 06:10:22 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-06-30 06:10:22 +0000 |
| commit | 501964be21dbc804430f165ed62ac5463539dcfd (patch) | |
| tree | 5e3d4fa9f3c9ea6cd8c9fc45b87058188f6c96e0 /sys/arch/octeon | |
| parent | cf54fb6a33374195bbcd8b1fdff277a1e5ba95e2 (diff) | |
Add "sd" to be specifiedit as "rootdev=" boot parameter.
ok jmatthew
Diffstat (limited to 'sys/arch/octeon')
| -rw-r--r-- | sys/arch/octeon/octeon/autoconf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/octeon/octeon/autoconf.c b/sys/arch/octeon/octeon/autoconf.c index b78c3fa54b9..e954d9c2464 100644 --- a/sys/arch/octeon/octeon/autoconf.c +++ b/sys/arch/octeon/octeon/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.5 2014/07/13 18:07:38 jasper Exp $ */ +/* $OpenBSD: autoconf.c,v 1.6 2015/06/30 06:10:21 yasuoka Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. * @@ -91,9 +91,10 @@ device_register(struct device *dev, void *aux) switch (bootdev_class) { case DV_DISK: - if (strcmp(drvrname, "wd") == 0 && strcmp(name, bootdev) == 0) - bootdv = dev; - if (strcmp(drvrname, "octcf") == 0 && strcmp(name, bootdev) == 0) + if ((strcmp(drvrname, "wd") == 0 || + strcmp(drvrname, "sd") == 0 || + strcmp(drvrname, "octcf") == 0) && + strcmp(name, bootdev) == 0) bootdv = dev; break; case DV_IFNET: |