d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug that would cause a spurious warning to appear to appear in an

Browse Source 
edge-case. The case was that you have been through the FTP setup once before
and on the second time through, you cancel at the re-selection of a new FTP
server.

The spurious warning was "device_media: not found" and was caused because
the underlying call to f_device_network_down() did not check to see if the
network device existed before attempting to shut it down.

Add checks to make sure we don't forge ahead unless the device exists.
This commit is contained in:
Devin Teske 2013-06-02 23:18:27 +00:00
parent 538d68ea69
commit faf9d0ce1c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/bsdconfig/share/media/ftp.subr
View File

@ -502,6 +502,7 @@ f_media_set_ftp_userpass()
f_device_network_up()
{
local dev="$1" netDev
f_struct device_$dev || return $FAILURE
device_$dev get private netDev || return $SUCCESS # No net == happy net
f_device_init $netDev
}
@ -513,6 +514,7 @@ f_device_network_up()
f_device_network_down()
{
local dev="$1" netDev
f_struct device_$dev || return $FAILURE
device_$dev get private netDev || return $SUCCESS
f_device_shutdown $netDev
}