Deleted Added
full compact
device.subr (259054) device.subr (264840)
1if [ ! "$_NETWORKING_DEVICE_SUBR" ]; then _NETWORKING_DEVICE_SUBR=1
2#
3# Copyright (c) 2006-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1if [ ! "$_NETWORKING_DEVICE_SUBR" ]; then _NETWORKING_DEVICE_SUBR=1
2#
3# Copyright (c) 2006-2013 Devin Teske
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/networking/share/device.subr 259054 2013-12-07 00:31:01Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/networking/share/device.subr 264840 2014-04-23 22:04:04Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." networking/device.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

--- 34 unchanged lines hidden (view full) ---

70 # Display a message to let the user know we're working...
71 # (message will remain until we throw up the next dialog)
72 #
73 f_dialog_info "$msg_probing_network_interfaces"
74
75 #
76 # Get list of usable network interfaces
77 #
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." networking/device.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/dialog.subr

--- 34 unchanged lines hidden (view full) ---

70 # Display a message to let the user know we're working...
71 # (message will remain until we throw up the next dialog)
72 #
73 f_dialog_info "$msg_probing_network_interfaces"
74
75 #
76 # Get list of usable network interfaces
77 #
78 local devs if iflist= # Calculated below
78 local dev devs if iflist= # Calculated below
79 f_device_rescan_network
80 f_device_find "" $DEVICE_TYPE_NETWORK devs
79 f_device_rescan_network
80 f_device_find "" $DEVICE_TYPE_NETWORK devs
81 for if in $devs; do
81 for dev in $devs; do
82 f_struct "$dev" get name if || continue
82 # Skip unsavory interfaces
83 case "$if" in
84 lo[0-9]*|ppp[0-9]*|sl[0-9]*|faith[0-9]*) continue ;;
85 esac
86 iflist="$iflist $if"
87 done
88 iflist="${iflist# }"
89

--- 295 unchanged lines hidden ---
83 # Skip unsavory interfaces
84 case "$if" in
85 lo[0-9]*|ppp[0-9]*|sl[0-9]*|faith[0-9]*) continue ;;
86 esac
87 iflist="$iflist $if"
88 done
89 iflist="${iflist# }"
90

--- 295 unchanged lines hidden ---