fdd2a0f31
Eric Andersen
2003-08-06
Subject
Eric Spakman writes:
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
networking/ifupdown.c+11 -7
| @@ -388,7 +388,7 @@ static int loopback_up6(struct interface_defn_t *ifd, execfn *exec) | |
| { | |
| #ifdef CONFIG_FEATURE_IFUPDOWN_IP | |
| int result; | |
| - | result =execute("ip addr add ::1 dev %iface% label %label%", ifd, exec); |
| + | result =execute("ip addr add ::1 dev %iface%", ifd, exec); |
| result += execute("ip link set %iface% up", ifd, exec); | |
| return( result); | |
| #else | |
| @@ -409,8 +409,8 @@ static int static_up6(struct interface_defn_t *ifd, execfn *exec) | |
| { | |
| int result; | |
| #ifdef CONFIG_FEATURE_IFUPDOWN_IP | |
| - | result = execute("ip addr add %address%/%netmask% dev %iface% label %label%", ifd, exec); |
| - | result += execute("ip link set %iface% up", ifd, exec); |
| + | result = execute("ip addr add %address%/%netmask% dev %iface% [[label %label%]]", ifd, exec); |
| + | result += execute("ip link set [[mtu %mtu%]] [[address %hwaddress%]] %iface% up", ifd, exec); |
| result += execute("[[ ip route add ::/0 via %gateway% ]]", ifd, exec); | |
| #else | |
| result = execute("ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up", ifd, exec); | |
| @@ -467,7 +467,7 @@ static int loopback_up(struct interface_defn_t *ifd, execfn *exec) | |
| { | |
| #ifdef CONFIG_FEATURE_IFUPDOWN_IP | |
| int result; | |
| - | result = execute("ip addr add 127.0.0.1/8 dev %iface% label %label%", ifd, exec); |
| + | result = execute("ip addr add 127.0.0.1/8 dev %iface%", ifd, exec); |
| result += execute("ip link set %iface% up", ifd, exec); | |
| return(result); | |
| #else | |
| @@ -492,8 +492,8 @@ static int static_up(struct interface_defn_t *ifd, execfn *exec) | |
| int result; | |
| #ifdef CONFIG_FEATURE_IFUPDOWN_IP | |
| result = execute("ip addr add %address%/%bnmask% [[broadcast %broadcast%]] " | |
| - | "dev %iface% label %label%", ifd, exec); |
| - | result += execute("ip link set %iface% up", ifd, exec); |
| + | "dev %iface% [[peer %pointopoint%]] [[label %label%]]", ifd, exec); |
| + | result += execute("ip link set [[mtu %mtu%]] [[address %hwaddress%]] %iface% up", ifd, exec); |
| result += execute("[[ ip route add default via %gateway% dev %iface% ]]", ifd, exec); | |
| #else | |
| result = execute("ifconfig %iface% %address% netmask %netmask% " | |
| @@ -569,7 +569,11 @@ static int bootp_up(struct interface_defn_t *ifd, execfn *exec) | |
| static int bootp_down(struct interface_defn_t *ifd, execfn *exec) | |
| { | |
| - | return( execute("ifconfig down %iface%", ifd, exec)); |
| + | #ifdef CONFIG_FEATURE_IFUPDOWN_IP |
| + | return(execute("ip link set %iface% down", ifd, exec)); |
| + | #else |
| + | return(execute("ifconfig %iface% down", ifd, exec)); |
| + | #endif |
| } | |
| static int ppp_up(struct interface_defn_t *ifd, execfn *exec) | |