diff options
| author | Rink Springer <rink@FreeBSD.org> | 2009-08-16 10:25:58 +0000 |
|---|---|---|
| committer | Rink Springer <rink@FreeBSD.org> | 2009-08-16 10:25:58 +0000 |
| commit | 1e2c2ea509ef398ff3edef495e3ff3e7acc3e5e0 (patch) | |
| tree | b683ec2d28bbd3cafb8ec3af17f097f065e28362 /usr.sbin/sysinstall | |
| parent | 7ea9d2977c0ea9f95f2fddf178ad002703c485ff (diff) | |
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)
Notes
Notes:
svn path=/stable/8/; revision=196273
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/media.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index e50b47c8edd4..b325323c613b 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.c @@ -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); } |