Author: rpokala
Date: Fri Feb 23 16:46:49 2018
New Revision: 329870
URL: https://svnweb.freebsd.org/changeset/base/329870

Log:
  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.

Modified:
  stable/10/usr.sbin/bsdinstall/partedit/gpart_ops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- stable/10/usr.sbin/bsdinstall/partedit/gpart_ops.c  Fri Feb 23 16:45:59 
2018        (r329869)
+++ stable/10/usr.sbin/bsdinstall/partedit/gpart_ops.c  Fri Feb 23 16:46:49 
2018        (r329870)
@@ -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;
        }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to