When doing a non-interactive installation, don't display an interactive

warning about a filesystem which doesn't have a mountpoint. Presumably, the
person who wrote the install script knew what they were doing.

Submitted by:	Brian Mueller <bmueller@panasas.com>
MFC after:	1 month
Sponsored by:	Panasas
Differential Revision:	https://reviews.freebsd.org/D12346
This commit is contained in:
Ravi Pokala 2017-09-12 22:19:21 +00:00
parent e389705ed3
commit 40f0d8dc4a

View File

@ -1043,14 +1043,17 @@ gpart_create(struct gprovider *pp, char *default_type, char *default_size,
/* Warn if no mountpoint set */
if (strcmp(items[0].text, "freebsd-ufs") == 0 &&
items[2].text[0] != '/') {
dialog_vars.defaultno = TRUE;
choice = dialog_yesno("Warning",
"This partition does not have a valid mountpoint "
"(for the partition from which you intend to boot the "
"operating system, the mountpoint should be /). Are you "
"sure you want to continue?"
, 0, 0);
dialog_vars.defaultno = FALSE;
choice = 0;
if (interactive) {
dialog_vars.defaultno = TRUE;
choice = dialog_yesno("Warning",
"This partition does not have a valid mountpoint "
"(for the partition from which you intend to boot the "
"operating system, the mountpoint should be /). Are you "
"sure you want to continue?"
, 0, 0);
dialog_vars.defaultno = FALSE;
}
if (choice == 1) /* cancel */
goto addpartform;
}