*** ifup	Mon Jan 17 17:57:51 2005
--- ifup.alt	Mon Jan 17 16:55:38 2005
***************
*** 49,55 ****
  IPSETUP=no
  
  DEVICETYPE=`echo "$DEVICE" | sed "s/[0-9]*$//"`
! REALDEVICE=`echo "$DEVICE" | sed 's/[.:].*//g'`
  if echo "$DEVICE" | fgrep -qs ':'; then
      ISALIAS=yes
  else
--- 49,55 ----
  IPSETUP=no
  
  DEVICETYPE=`echo "$DEVICE" | sed "s/[0-9]*$//"`
! REALDEVICE=`echo "$DEVICE" | sed 's/:.*//g'`
  if echo "$DEVICE" | fgrep -qs ':'; then
      ISALIAS=yes
  else
***************
*** 108,114 ****
  	    vlan_id=`echo $DEVICE | sed "s/^vlan0*//g"`
  	    ;;
  	DEV_PLUS_VID|DEV_PLUS_VID_NO_PAD)
! 	    vlan_id=`echo $DEVICE | sed "s/^[a-z0-9]*\.0*//g"`
  	    ;;
      esac
  
--- 108,114 ----
  	    vlan_id=`echo $DEVICE | sed "s/^vlan0*//g"`
  	    ;;
  	DEV_PLUS_VID|DEV_PLUS_VID_NO_PAD)
! 	    vlan_id=`echo $DEVICE | sed "s/^[a-z0-9]\+\.0*//g"`
  	    ;;
      esac
  
***************
*** 319,325 ****
  			exit 1
  		fi
  	fi
! elif [ "$BOOTPROTO" = static ]; then
  	if [ -z "$NETMASK" ]; then
  		eval `/bin/ipcalc --netmask "$IPADDR"`
  	fi
--- 319,325 ----
  			exit 1
  		fi
  	fi
! else
  	if [ -z "$NETMASK" ]; then
  		eval `/bin/ipcalc --netmask "$IPADDR"`
  	fi
***************
*** 354,362 ****
  			ip route add default dev "$DEVICE"
  		fi
  	fi
- else
- 	# "$DEVICE: BOOTPROTO=none?"
- 	/sbin/ip link set up dev "$DEVICE"
  fi
  
  SYSCTL_PREFIX=net.ipv4.conf.$DEVICE
--- 354,359 ----
***************
*** 364,370 ****
  [ -n "$SYSCTL_RP_FILTER" ] &&    sysctl -w $SYSCTL_PREFIX.rp_filter=$SYSCTL_RP_FILTER
  [ -n "$SYSCTL_LOG_MARTIANS" ] && sysctl -w $SYSCTL_PREFIX.log_martians=$SYSCTL_LOG_MARTIANS
  
- # ???
  . /etc/sysconfig/network
  
  if is_yes "$IPX"; then
--- 361,366 ----