1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00

- Hide 'incorrect geometry warning' in non-interactive mode. A user should

know what they are doing in non-interactive mode.  Less scarier warning
goes to debugging info instead.
- Print sanitized geometry to debugging info.
This commit is contained in:
Jung-uk Kim 2006-01-27 21:41:49 +00:00
parent 100650dee1
commit b5b86d9583
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=154931
2 changed files with 36 additions and 22 deletions
usr.sbin
sade
sysinstall

View File

@ -124,6 +124,7 @@ 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"
@ -135,7 +136,13 @@ print_chunks(Disk *d, int u)
"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);
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");

View File

@ -124,6 +124,7 @@ 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"
@ -135,7 +136,13 @@ print_chunks(Disk *d, int u)
"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);
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");