[src/netbsd-1-4]: src/distrib/utils/sysinst Pull up revision 1.22 (requested ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/468135fbab3c
branches:  netbsd-1-4
changeset: 470628:468135fbab3c
user:      he <he%NetBSD.org@localhost>
date:      Thu Jun 01 17:35:20 2000 +0000

description:
Pull up revision 1.22 (requested by fvdl):
  Fix a booting problem when int13 extensions are used (> 8GB),
  and CHS values in MBRs were written from sysinst or fdisk that
  some BIOSes (Adaptec SCSI BIOS 2.20 in particular) didn't like.

diffstat:

 distrib/utils/sysinst/mbr.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (28 lines):

diff -r 17a43ca5c812 -r 468135fbab3c distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Thu Jun 01 17:27:34 2000 +0000
+++ b/distrib/utils/sysinst/mbr.c       Thu Jun 01 17:35:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.11.2.5 1999/07/12 19:29:37 perry Exp $ */
+/*     $NetBSD: mbr.c,v 1.11.2.6 2000/06/01 17:35:20 he Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -500,14 +500,13 @@
 {
        unsigned int tcyl, temp, thead, tsec;
 
+       temp = cyl * head * sec - 1;
+       if (relsecs >= temp)
+               relsecs = temp;
+
        temp = head * sec;
        tcyl = relsecs / temp;
 
-       if (tcyl >= 1024) {
-               *cylp = *headp = *secp = 0xff;
-               return;
-       }
-
        relsecs %= temp;
        thead = relsecs / sec;