diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-04-13 03:08:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-04-13 03:08:45 +0000 |
| commit | 8ae3f879a93b9d7b9c8a50eec99c9c337612bc9f (patch) | |
| tree | 071a55201ed19e919bd73cad312284e33f2fe33f /sys/arch/i386 | |
| parent | 63970b0cbf0b19955fdb56ec5e045d6f586d294c (diff) | |
Try MUCH harder to always print a "root on" line
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index db2839eb7e8..3ef6c8e06ea 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.43 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: autoconf.c,v 1.44 2002/04/13 03:08:44 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -234,9 +234,9 @@ setroot() * If the original rootdev is the same as the one * just calculated, don't need to adjust the swap configuration. */ + printf("root on %s%d%c\n", findblkname(majdev), unit, part + 'a'); if (rootdev == orootdev) return; - printf("root on %s%d%c\n", findblkname(majdev), unit, part + 'a'); #ifdef DOSWAP for (swp = swdevt; swp->sw_dev != NODEV; swp++) { @@ -394,6 +394,14 @@ noask: setroot(); } else { /* preconfigured */ + int majdev, unit, part; + + majdev = major(rootdev); + if (findblkname(majdev) == NULL) + return; + part = minor(rootdev) % MAXPARTITIONS; + unit = minor(rootdev) / MAXPARTITIONS; + printf("root on %s%d%c\n", findblkname(majdev), unit, part + 'a'); return; } |