diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2000-03-23 01:24:29 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2000-03-23 01:24:29 +0000 |
| commit | 0b257b21d99b20a1d5359e7301e21a2f93e948d3 (patch) | |
| tree | 53f08a5c2d872526d931473adee9afd1f77340aa | |
| parent | 8a6511850ad9b75e31e9c9e7d145c88167fed59b (diff) | |
Don't use the BIOS geometry by default, it causes too many problems.
| -rw-r--r-- | sbin/disklabel/editor.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 2d7ae204360..3a06571f0ce 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.67 2000/02/21 14:28:02 deraadt Exp $ */ +/* $OpenBSD: editor.c,v 1.68 2000/03/23 01:24:28 millert Exp $ */ /* * Copyright (c) 1997-1999 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.67 2000/02/21 14:28:02 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.68 2000/03/23 01:24:28 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -1727,23 +1727,6 @@ find_bounds(lp, bios_lp) } if (new_end > ending_sector) ending_sector = new_end; - - /* - * If we are honoring the fdisk partitions, we should - * use the BIOS geometry unless ending_sector is beyond - * the end of the BIOS geometry, in which case we know - * the BIOS geometry is bogus. - */ - if (bios_lp != NULL && ending_sector <= bios_lp->d_secperunit) { - lp->d_secsize = bios_lp->d_secsize; - lp->d_nsectors = bios_lp->d_nsectors; - lp->d_ntracks = bios_lp->d_ntracks; - lp->d_ncylinders = bios_lp->d_ncylinders; - lp->d_secpercyl = bios_lp->d_secpercyl; - lp->d_secperunit = bios_lp->d_secperunit; - puts("Using BIOS geometry...\nYou can use the " - "'g' command to change this."); - } } else { /* Don't trounce the MBR */ starting_sector = 63; |