summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1999-05-09 10:42:39 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1999-05-09 10:42:39 +0000
commit9cead0b272c251f3fa0af1ae1ead052cc3920df7 (patch)
tree58a9075d3b763f231ed2c00e1d9e9d5d16bc5f34 /sys
parent1a4dd80a43cd645b95df4e856a85a0305336043c (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/i386/swapgeneric.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 5a928cbc5b7a..7edef30ab5d2 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91
- * $Id: swapgeneric.c,v 1.28 1999/04/15 15:35:32 bde Exp $
+ * $Id: swapgeneric.c,v 1.29 1999/05/07 10:10:25 phk Exp $
*/
#include <sys/param.h>
@@ -55,6 +55,7 @@ setconf()
char name[128];
char *cp;
int bd, unit;
+ dev_t dev;
retry:
printf("root device? ");
@@ -72,10 +73,12 @@ retry:
}
unit = *cp - '0';
*cp++ = '\0';
- for (bd = 0; bd < nblkdev; bd++)
- if (bdevsw(bd) != NULL &&
- strcmp(bdevsw(bd)->d_name, name) == 0)
+ for (bd = 0; bd < nblkdev; bd++) {
+ dev = makedev(bd, 0);
+ if (bdevsw(dev) != NULL &&
+ strcmp(bdevsw(dev)->d_name, name) == 0)
goto gotit;
+ }
goto bad;
gotit:
while (*cp >= '0' && *cp <= '9')