--- /usr/bin/netcfg 2007-03-04 15:54:24.000000000 +0200 +++ /usr/bin/netcfg 2007-01-30 00:25:24.000000000 +0200 @@ -100,17 +100,11 @@ stat_busy "Starting network profile: $1" # Re-read the profile (stop_profile might have overwritten our settings) - unset DESCRIPTION INTERFACE IFOPTS PRE_IFOPTS + unset DESCRIPTION INTERFACE IFOPTS unset IWOPTS WIFI_INTERFACE WIFI_WAIT USEWPA WPAOPTS - unset GATEWAY HOSTNAME DOMAIN DNS1 DNS2 SEARCH + unset GATEWAY HOSTNAME DOMAIN DNS1 DNS2 . $PROFILE_DIR/$1 - # do necessary preconfiguration - if [ "$PRE_IFOPTS" ]; then - ifconfig $INTERFACE down # just to be sure - ifconfig $INTERFACE $PRE_IFOPTS - fi - # Configure wireless settings, if necessary [ "$WIFI_INTERFACE" ] || WIFI_INTERFACE=$INTERFACE @@ -183,12 +177,6 @@ [ "$DNS2" ] && echo "nameserver $DNS2" >>/etc/resolv.conf fi - # Append search path - if [ "$SEARCH" ]; then - [ ! -e /etc/resolv.conf ] && stat_fail && return - echo "search $SEARCH" >>/etc/resolv.conf - fi - # Save the info in /var/run so we can shut it down later mkdir -p $STATE_DIR cp $PROFILE_DIR/$1 $STATE_DIR/$INTERFACE