diff options
| author | jkim <jkim@FreeBSD.org> | 2008-01-31 16:54:02 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2008-01-31 16:54:02 +0000 |
| commit | 7741f44ec27c3e834b9a0be92c3b6578a478fc66 (patch) | |
| tree | d912c3d519692d828ce5bb1f02a977cc3b451edd /usr.sbin/sysinstall | |
| parent | 9c769565243961b07fe6ace665b47f5c6de6588d (diff) | |
| download | FreeBSD-src-7741f44ec27c3e834b9a0be92c3b6578a478fc66.zip FreeBSD-src-7741f44ec27c3e834b9a0be92c3b6578a478fc66.tar.gz | |
Do not sanitize disk geometry if it is set by scripts in non-interactive mode.
MFC after: 3 days
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/disks.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index fa4b39f..ada0f66 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); |
