From 6637b6368ecf152e75a06de32ff7ffaedc0a7b68 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Thu, 23 Feb 2006 23:41:42 +0000 Subject: [PATCH] - Back out 1.155. I mismerged my ancient local patch. Luckily it was completely noop. - Geometry sanitization for non-interactive mode is moved to correct place. Reported by: Anton Yuzhaninov Pointyhat: me --- usr.sbin/sade/disks.c | 41 +++++++++++++++++++++---------------- usr.sbin/sysinstall/disks.c | 41 +++++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 4b3dac9bee80..b60012f50272 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -124,25 +124,18 @@ print_chunks(Disk *d, int u) #else if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { #endif - if (!variable_get(VAR_NONINTERACTIVE)) { - dialog_clear_norefresh(); - msgConfirm("WARNING: A geometry of %lu/%lu/%lu for %s is incorrect. Using\n" - "a more likely geometry. If this geometry is incorrect or you\n" - "are unsure as to whether or not it's correct, please consult\n" - "the Hardware Guide in the Documentation submenu or use the\n" - "(G)eometry command to change it now.\n\n" - "Remember: you need to enter whatever your BIOS thinks the\n" - "geometry is! For IDE, it's what you were told in the BIOS\n" - "setup. For SCSI, it's the translation mode your controller is\n" - "using. Do NOT use a ``physical geometry''.", - d->bios_cyl, d->bios_hd, d->bios_sect, d->name); - } - else - msgDebug("A geometry of %lu/%lu/%lu for %s is incorrect.\n", - d->bios_cyl, d->bios_hd, d->bios_sect, d->name); + dialog_clear_norefresh(); + msgConfirm("WARNING: A geometry of %lu/%lu/%lu for %s is incorrect. Using\n" + "a more likely geometry. If this geometry is incorrect or you\n" + "are unsure as to whether or not it's correct, please consult\n" + "the Hardware Guide in the Documentation submenu or use the\n" + "(G)eometry command to change it now.\n\n" + "Remember: you need to enter whatever your BIOS thinks the\n" + "geometry is! For IDE, it's what you were told in the BIOS\n" + "setup. For SCSI, it's the translation mode your controller is\n" + "using. Do NOT use a ``physical geometry''.", + 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); } attrset(A_NORMAL); mvaddstr(0, 0, "Disk name:\t"); @@ -923,6 +916,18 @@ diskPartitionNonInteractive(Device *dev) d->bios_sect = strtol(cp + 1, 0, 0); } +#ifdef PC98 + 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) { +#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", + d->name, d->bios_cyl, d->bios_hd, d->bios_sect); + } + cp = variable_get(VAR_PARTITION); if (cp) { if (!strcmp(cp, "free")) { diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 4b3dac9bee80..b60012f50272 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -124,25 +124,18 @@ print_chunks(Disk *d, int u) #else if (d->bios_cyl > 65536 || d->bios_hd > 256 || d->bios_sect >= 64) { #endif - if (!variable_get(VAR_NONINTERACTIVE)) { - dialog_clear_norefresh(); - msgConfirm("WARNING: A geometry of %lu/%lu/%lu for %s is incorrect. Using\n" - "a more likely geometry. If this geometry is incorrect or you\n" - "are unsure as to whether or not it's correct, please consult\n" - "the Hardware Guide in the Documentation submenu or use the\n" - "(G)eometry command to change it now.\n\n" - "Remember: you need to enter whatever your BIOS thinks the\n" - "geometry is! For IDE, it's what you were told in the BIOS\n" - "setup. For SCSI, it's the translation mode your controller is\n" - "using. Do NOT use a ``physical geometry''.", - d->bios_cyl, d->bios_hd, d->bios_sect, d->name); - } - else - msgDebug("A geometry of %lu/%lu/%lu for %s is incorrect.\n", - d->bios_cyl, d->bios_hd, d->bios_sect, d->name); + dialog_clear_norefresh(); + msgConfirm("WARNING: A geometry of %lu/%lu/%lu for %s is incorrect. Using\n" + "a more likely geometry. If this geometry is incorrect or you\n" + "are unsure as to whether or not it's correct, please consult\n" + "the Hardware Guide in the Documentation submenu or use the\n" + "(G)eometry command to change it now.\n\n" + "Remember: you need to enter whatever your BIOS thinks the\n" + "geometry is! For IDE, it's what you were told in the BIOS\n" + "setup. For SCSI, it's the translation mode your controller is\n" + "using. Do NOT use a ``physical geometry''.", + 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); } attrset(A_NORMAL); mvaddstr(0, 0, "Disk name:\t"); @@ -923,6 +916,18 @@ diskPartitionNonInteractive(Device *dev) d->bios_sect = strtol(cp + 1, 0, 0); } +#ifdef PC98 + 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) { +#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", + d->name, d->bios_cyl, d->bios_hd, d->bios_sect); + } + cp = variable_get(VAR_PARTITION); if (cp) { if (!strcmp(cp, "free")) {