From owner-svn-src-all@FreeBSD.ORG  Sun Aug 16 10:25:58 2009
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 D855B106568B;
	Sun, 16 Aug 2009 10:25:58 +0000 (UTC)
	(envelope-from rink@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C6B2E8FC43;
	Sun, 16 Aug 2009 10:25:58 +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 n7GAPwtH013234;
	Sun, 16 Aug 2009 10:25:58 GMT (envelope-from rink@svn.freebsd.org)
Received: (from rink@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7GAPwMY013232;
	Sun, 16 Aug 2009 10:25:58 GMT (envelope-from rink@svn.freebsd.org)
Message-Id: <200908161025.n7GAPwMY013232@svn.freebsd.org>
From: Rink Springer <rink@FreeBSD.org>
Date: Sun, 16 Aug 2009 10:25:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196273 - stable/8/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: Sun, 16 Aug 2009 10:25:59 -0000

Author: rink
Date: Sun Aug 16 10:25:58 2009
New Revision: 196273
URL: http://svn.freebsd.org/changeset/base/196273

Log:
  MFC r196272
  
  Prevent sysinstall from needlessly waiting for confirmation when using an USB
  device in non-interactive mode.
  
  If there are no USB devices, sysinstall gives an error messages, and if there
  is >1, it'll ask which one is to be used. This change allows a non-interactive
  install from USB media to succeed without any user interaction if there is
  exactly one USB disk device in the system it can use.
  
  Submitted by: Daniel O'Connor < doconnorat gsoft dot com dot au >
  Reviewed by:  randi
  Approved by:  re (rwatson)

Modified:
  stable/8/usr.sbin/sysinstall/   (props changed)
  stable/8/usr.sbin/sysinstall/media.c

Modified: stable/8/usr.sbin/sysinstall/media.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/media.c	Sun Aug 16 10:11:33 2009	(r196272)
+++ stable/8/usr.sbin/sysinstall/media.c	Sun Aug 16 10:25:58 2009	(r196273)
@@ -262,7 +262,8 @@ mediaSetUSB(dialogMenuItem *self)
 		mediaDevice = devs[0];
 	if (mediaDevice)
 		mediaDevice->private = NULL;
-	msgConfirm("Using USB device: %s", mediaDevice->name);
+	if (!variable_get(VAR_NONINTERACTIVE))
+		msgConfirm("Using USB device: %s", mediaDevice->name);
 	return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE);
 }