svn commit: r203390 - stable/8/usr.sbin/sysinstall

John Baldwin jhb at FreeBSD.org
Tue Feb 2 18:50:03 UTC 2010


Author: jhb
Date: Tue Feb  2 18:50:02 2010
New Revision: 203390
URL: http://svn.freebsd.org/changeset/base/203390

Log:
  MFC 203032:
  Don't pop up the menu to select a documentation language for non-interactive
  installs.  Default to not installing any documentation in that case.

Modified:
  stable/8/usr.sbin/sysinstall/dist.c
Directory Properties:
  stable/8/usr.sbin/sysinstall/   (props changed)

Modified: stable/8/usr.sbin/sysinstall/dist.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/dist.c	Tue Feb  2 18:48:09 2010	(r203389)
+++ stable/8/usr.sbin/sysinstall/dist.c	Tue Feb  2 18:50:02 2010	(r203390)
@@ -783,6 +783,10 @@ distSetDoc(dialogMenuItem *self)
 {
     int i;
 
+    /* Assume no docs for non-interactive installs. */
+    if (variable_get(VAR_NONINTERACTIVE))
+	return DITEM_SUCCESS | DITEM_RESTORE;
+
     dialog_clear_norefresh();
     if (!dmenuOpenSimple(&MenuDocInstall, FALSE))
 	i = DITEM_FAILURE;


More information about the svn-src-stable mailing list