summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>1998-03-09 08:35:33 +0000
committermsmith <msmith@FreeBSD.org>1998-03-09 08:35:33 +0000
commit79cce3bc9f4b3cdf19efdfdaa61a09b6c31ae8c3 (patch)
tree78b989a5f23b1cc2de74eaa70b47934425339382
parentf6b43acab69e713e88c5ec2a41b2ebc74a4eca99 (diff)
downloadFreeBSD-src-79cce3bc9f4b3cdf19efdfdaa61a09b6c31ae8c3.zip
FreeBSD-src-79cce3bc9f4b3cdf19efdfdaa61a09b6c31ae8c3.tar.gz
"Correct behaviour" involves being consistent with the canonical names of
other partitions. In this case, they appear in the first slice in the WHOLE_DISK_SLICE case.
-rw-r--r--sys/amd64/amd64/autoconf.c4
-rw-r--r--sys/i386/i386/autoconf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 665ddc9..dfca052 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.86 1998/03/08 15:06:55 msmith Exp $
+ * $Id: autoconf.c,v 1.87 1998/03/09 08:10:21 msmith Exp $
*/
/*
@@ -456,7 +456,7 @@ setroot()
unit = B_UNIT(bootdev);
slice = B_SLICE(bootdev);
if ((slice < BASE_SLICE) || (slice > MAX_SLICES))
- slice = 0;
+ slice = BASE_SLICE;
if (majdev > sizeof(devname) / sizeof(devname[0]))
return;
if (majdev == FDMAJOR) {
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 665ddc9..dfca052 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.86 1998/03/08 15:06:55 msmith Exp $
+ * $Id: autoconf.c,v 1.87 1998/03/09 08:10:21 msmith Exp $
*/
/*
@@ -456,7 +456,7 @@ setroot()
unit = B_UNIT(bootdev);
slice = B_SLICE(bootdev);
if ((slice < BASE_SLICE) || (slice > MAX_SLICES))
- slice = 0;
+ slice = BASE_SLICE;
if (majdev > sizeof(devname) / sizeof(devname[0]))
return;
if (majdev == FDMAJOR) {
OpenPOWER on IntegriCloud