From 4a994e8a935a09949cefd2f34722b88c33fb2ea7 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Thu, 31 Jan 2008 16:54:02 +0000 Subject: Do not sanitize disk geometry if it is set by scripts in non-interactive mode. MFC after: 3 days --- usr.sbin/sysinstall/disks.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index fa4b39f495ab..ada0f6673c6f 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -920,18 +920,18 @@ diskPartitionNonInteractive(Device *dev) d->bios_cyl = strtol(cp, &cp, 0); d->bios_hd = strtol(cp + 1, &cp, 0); d->bios_sect = strtol(cp + 1, 0, 0); - } - + } else { #ifdef PC98 - if (d->bios_cyl >= 65536 || d->bios_hd > 256 || d->bios_sect >= 256) { + if (d->bios_cyl >= 65536 || d->bios_hd > 256 || d->bios_sect >= 256) { #else - if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { + if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { #endif - msgDebug("Warning: A geometry of %lu/%lu/%lu for %s is incorrect.\n", - d->bios_cyl, d->bios_hd, d->bios_sect, d->name); - Sanitize_Bios_Geom(d); - msgDebug("Sanitized geometry for %s is %lu/%lu/%lu.\n", + msgDebug("Warning: A geometry of %lu/%lu/%lu for %s is incorrect.\n", + d->bios_cyl, d->bios_hd, d->bios_sect, d->name); + Sanitize_Bios_Geom(d); + msgDebug("Sanitized geometry for %s is %lu/%lu/%lu.\n", d->name, d->bios_cyl, d->bios_hd, d->bios_sect); + } } cp = variable_get(VAR_PARTITION); -- cgit v1.3