svn commit: r323508 - head/usr.sbin/bsdinstall/partedit
Ravi Pokala
rpokala at FreeBSD.org
Tue Sep 12 22:19:22 UTC 2017
Author: rpokala
Date: Tue Sep 12 22:19:21 2017
New Revision: 323508
URL: https://svnweb.freebsd.org/changeset/base/323508
Log:
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 at panasas.com>
MFC after: 1 month
Sponsored by: Panasas
Differential Revision: https://reviews.freebsd.org/D12346
Modified:
head/usr.sbin/bsdinstall/partedit/gpart_ops.c
Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Tue Sep 12 21:36:13 2017 (r323507)
+++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Tue Sep 12 22:19:21 2017 (r323508)
@@ -1043,14 +1043,17 @@ addpartform:
/* 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;
}
More information about the svn-src-head
mailing list