diff options
| -rw-r--r-- | UPDATING | 7 | ||||
| -rw-r--r-- | etc/network.subr | 41 |
2 files changed, 14 insertions, 34 deletions
@@ -21,6 +21,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW: developers choose to disable these features on build machines to maximize performance. +20050629: + The pccard_ifconfig rc.conf variable has been removed and a new + variable, ifconfig_DEFAULT has been introduced. Unlike + pccard_ifconfig, ifconfig_DEFAULT applies to ALL interfaces that + do not have ifconfig_ifn entries rather than just those in + removable_interfaces. + 20050610: Major changes to network interface API. All drivers must be recompiled. Drivers not in the base system will need to be diff --git a/etc/network.subr b/etc/network.subr index b05635a..b54cdbb 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -113,16 +113,11 @@ _ifconfig_getargs() fi eval _args=\$ifconfig_$1 - if [ -z "$_args" -a -n "${pccard_ifconfig}" ]; then - for _if in ${removable_interfaces} ; do - if [ "$_if" = "$_ifn" ] ; then - _args=${pccard_ifconfig} - break - fi - done + if [ -z "$_args" ]; then + _args=$ifconfig_DEFAULT fi - echo $_args + echo "$_args" } # ifconfig_getargs if @@ -394,7 +389,7 @@ list_net_interfaces() _tmplist="`ifconfig -l`" ;; *) - _tmplist="${network_interfaces} ${cloned_interfaces}" + _tmplist="${network_interfaces} ${removable_interfaces} ${cloned_interfaces}" ;; esac @@ -408,37 +403,15 @@ list_net_interfaces() _aprefix= _bprefix= for _if in ${_tmplist} ; do - eval _ifarg="\$ifconfig_${_if}" - case "$_ifarg" in - [Dd][Hh][Cc][Pp]) + if dhcpif $_if; then _dhcplist="${_dhcplist}${_aprefix}${_if}" [ -z "$_aprefix" ] && _aprefix=' ' - ;; - ''|*) + elif [ -n "`_ifconfig_getargs $if`" ]; then _nodhcplist="${_nodhcplist}${_bprefix}${_if}" [ -z "$_bprefix" ] && _bprefix=' ' - ;; - esac + fi done - case ${pccard_ifconfig} in - [Dd][Hh][Cc][Pp]) - for _if in ${removable_interfaces} ; do - _test_if=`ifconfig ${_if} 2>&1` - case "$_test_if" in - "ifconfig: interface $_if does not exist") - ;; - *) - _dhcplist="${_dhcplist}${_aprefix}${_if}" - [ -z "$_aprefix" ] && _aprefix=' ' - ;; - esac - done - ;; - *) - ;; - esac - case "$type" in nodhcp) echo $_nodhcplist |
