From: Ben Gras <ben@minix3.org>
Date: Wed, 21 Sep 2005 15:10:52 +0000 (+0000)
Subject: Give up on bogus geometry.
X-Git-Tag: v3.1.0~39
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=9040daa95ac97d1e7d1d06ad7781a63d2cb33bdf;p=minix.git

Give up on bogus geometry.
---

diff --git a/commands/ibm/autopart.c b/commands/ibm/autopart.c
index 6ea135e24..6059bf071 100755
--- a/commands/ibm/autopart.c
+++ b/commands/ibm/autopart.c
@@ -642,27 +642,11 @@ void geometry(void)
 		}
 
 		if (heads != alt_heads || sectors != alt_secs) {
-			stat_start(1);
-			printf("WARNING:");
-			stat_end(10);
-			stat_start(0);
-			printf(
-"The %ux%ux%u geometry obtained from the device driver does not match",
-				cylinders, heads, sectors);
-			stat_end(10);
-			stat_start(0);
-			printf(
-"the %ux%ux%u geometry implied by the partition table.  Hit 'X' to switch",
-				alt_cyls, alt_heads, alt_secs);
-			stat_end(10);
-			stat_start(0);
-			printf(
-"between the two geometries to see what is best.  Note that the geometry");
-			stat_end(10);
-			stat_start(0);
-			printf(
-"must be correct when the table is written or the system may not boot!");
-			stat_end(10);
+printf(
+"The %ux%ux%u geometry obtained from the driver\n"
+"does not match the %ux%ux%u geometry implied by the partition\n"
+"table. Please use expert mode instead.\n");
+exit(1);
 		}
 	}
 
@@ -2723,7 +2707,9 @@ do_autopart(int resultfd)
 				perror(devname);
 			} else {
 				/* Clear any subpartitioning. */
-				static char sub[2048];
+				static unsigned char sub[2048];
+				sub[510] = 0x55;
+				sub[511] = 0xAA;
 				write(fd, sub, sizeof(sub));
 				close(fd);
 			}