From owner-svn-src-all@FreeBSD.ORG  Tue Jan 26 15:29:53 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 551491065694;
	Tue, 26 Jan 2010 15:29:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4623F8FC08;
	Tue, 26 Jan 2010 15:29:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0QFTrh6029145;
	Tue, 26 Jan 2010 15:29:53 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0QFTru6029143;
	Tue, 26 Jan 2010 15:29:53 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201001261529.o0QFTru6029143@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 26 Jan 2010 15:29:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203032 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2010 15:29:53 -0000

Author: jhb
Date: Tue Jan 26 15:29:53 2010
New Revision: 203032
URL: http://svn.freebsd.org/changeset/base/203032

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

Modified:
  head/usr.sbin/sysinstall/dist.c

Modified: head/usr.sbin/sysinstall/dist.c
==============================================================================
--- head/usr.sbin/sysinstall/dist.c	Tue Jan 26 15:28:00 2010	(r203031)
+++ head/usr.sbin/sysinstall/dist.c	Tue Jan 26 15:29:53 2010	(r203032)
@@ -775,6 +775,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;