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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
