d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/bsdinstall/partedit/gpart_ops.c
View File

@ -1043,6 +1043,8 @@ addpartform:
/* Warn if no mountpoint set */ /* Warn if no mountpoint set */
if (strcmp(items[0].text, "freebsd-ufs") == 0 && if (strcmp(items[0].text, "freebsd-ufs") == 0 &&
items[2].text[0] != '/') { items[2].text[0] != '/') {
choice = 0;
if (interactive) {
dialog_vars.defaultno = TRUE; dialog_vars.defaultno = TRUE;
choice = dialog_yesno("Warning", choice = dialog_yesno("Warning",
"This partition does not have a valid mountpoint " "This partition does not have a valid mountpoint "
@ -1051,6 +1053,7 @@ addpartform:
"sure you want to continue?" "sure you want to continue?"
, 0, 0); , 0, 0);
dialog_vars.defaultno = FALSE; dialog_vars.defaultno = FALSE;
}
if (choice == 1) /* cancel */ if (choice == 1) /* cancel */
goto addpartform; goto addpartform;
} }