diff options
author | rpokala <rpokala@FreeBSD.org> | 2018-02-23 16:45:59 +0000 |
---|---|---|
committer | rpokala <rpokala@FreeBSD.org> | 2018-02-23 16:45:59 +0000 |
commit | 7cc8f4530111ec4a22a0602cb12e7336b5165f7a (patch) | |
tree | d4cd4e716bab56868900152714a206c0c38e9c82 | |
parent | 4660fc24b7e662be2191e22b89a36a793848b159 (diff) | |
download | FreeBSD-src-7cc8f4530111ec4a22a0602cb12e7336b5165f7a.zip FreeBSD-src-7cc8f4530111ec4a22a0602cb12e7336b5165f7a.tar.gz |
MFC r323508:
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.
-rw-r--r-- | usr.sbin/bsdinstall/partedit/gpart_ops.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index a502e72..59d0de5 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -1034,14 +1034,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; } |