--- network 2008-10-08 20:21:32.000000000 +0200 +++ network.bak-default 2008-09-18 22:26:34.000000000 +0200 @@ -57,15 +57,13 @@ return 1 fi eval ifcfg="\$${1}" - # Always bring the interface itself down if [ "$ifcfg" = "dhcp" ]; then if [ -f /var/run/dhcpcd-${1}.pid ]; then /bin/kill $(cat /var/run/dhcpcd-${1}.pid) fi - /sbin/ifconfig ${1} down >/dev/null 2>&1 - else - /sbin/ifconfig ${ifcfg%% *} down >/dev/null 2>&1 fi + # Always bring the interface itself down + /sbin/ifconfig ${1} down >/dev/null 2>&1 return $? } @@ -164,30 +162,6 @@ done } -vlan_up() -{ - for ifline in ${VLAN_INTERFACES[@]}; do - if [ "$ifline" = "${ifline#!}" ]; then - eval ifcfg="\$${ifline}" - vlan=${ifcfg#*.} - vlan=${vlan%% *} - /usr/sbin/vconfig add ${ifcfg%%.*} $vlan >/dev/null || error=1 - ifup $ifline || error=1 - fi - done -} - -vlan_down() -{ - for ifline in ${VLAN_INTERFACES[@]}; do - if [ "$ifline" = "${ifline#!}" ]; then - ifdown $ifline || error=1 - eval ifcfg="\$${ifline}" - /usr/sbin/vconfig rem ${ifcfg%% *} >/dev/null || error=1 - fi - done -} - case "$1" in start) @@ -208,8 +182,6 @@ done # bring up bond interfaces bond_up - # bring up vlan interfaces - vlan_up # bring up routes for rtline in "${ROUTES[@]}"; do if [ "$rtline" = "${rtline#!}" ]; then @@ -237,8 +209,6 @@ rtdown $rtline || error=1 fi done - # bring down vlan interfaces - vlan_down for ifline in ${INTERFACES[@]}; do if [ "$ifline" = "${ifline#!}" ]; then ifdown $ifline || error=1