base-files: r22444 caused interfaces to remain down if the macaddr option is used, fix it. Also localize the txqueuelen option variable

SVN-Revision: 22467
This commit is contained in:
Jo-Philipp Wich 2010-08-02 20:45:52 +00:00
parent a5fdf57a1b
commit 8c4ac87e8f

View file

@ -325,12 +325,12 @@ setup_interface() {
# Interface settings # Interface settings
grep "$iface:" /proc/net/dev > /dev/null && { grep "$iface:" /proc/net/dev > /dev/null && {
local mtu macaddr local mtu macaddr txqueuelen
config_get mtu "$config" mtu config_get mtu "$config" mtu
config_get macaddr "$config" macaddr config_get macaddr "$config" macaddr
config_get txqueuelen "$config" txqueuelen config_get txqueuelen "$config" txqueuelen
[ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down [ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down
$DEBUG ifconfig "$iface_main" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} ${txqueuelen:+txqueuelen $txqueuelen} up $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} ${txqueuelen:+txqueuelen $txqueuelen} up
} }
set_interface_ifname "$config" "$iface" set_interface_ifname "$config" "$iface"