upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MFC r196272

Browse source 
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)
This commit is contained in:
Rink Springer 2009-08-16 10:25:58 +00:00
parent 7ea9d2977c
commit 1e2c2ea509
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr.sbin/sysinstall/media.c
View file

@ -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);
}