diff options
Diffstat (limited to 'networking/ifupdown.c')
-rw-r--r-- | networking/ifupdown.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index c232d86a6..d7cb40f32 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -349,7 +349,7 @@ static int static_up6(struct interface_defn_t *ifd, execfn *exec) | |||
349 | int result; | 349 | int result; |
350 | #if ENABLE_FEATURE_IFUPDOWN_IP | 350 | #if ENABLE_FEATURE_IFUPDOWN_IP |
351 | result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec); | 351 | result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec); |
352 | result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", ifd, exec); | 352 | result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec); |
353 | /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */ | 353 | /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */ |
354 | result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec); | 354 | result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec); |
355 | #else | 355 | #else |
@@ -433,7 +433,7 @@ static int static_up(struct interface_defn_t *ifd, execfn *exec) | |||
433 | #if ENABLE_FEATURE_IFUPDOWN_IP | 433 | #if ENABLE_FEATURE_IFUPDOWN_IP |
434 | result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] " | 434 | result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] " |
435 | "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec); | 435 | "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec); |
436 | result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", ifd, exec); | 436 | result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec); |
437 | result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec); | 437 | result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec); |
438 | return ((result == 3) ? 3 : 0); | 438 | return ((result == 3) ? 3 : 0); |
439 | #else | 439 | #else |
@@ -500,7 +500,7 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | |||
500 | unsigned i; | 500 | unsigned i; |
501 | #if ENABLE_FEATURE_IFUPDOWN_IP | 501 | #if ENABLE_FEATURE_IFUPDOWN_IP |
502 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ | 502 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ |
503 | if (!execute("ip link set[[ address %hwaddress%]] %iface% up", ifd, exec)) | 503 | if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec)) |
504 | return 0; | 504 | return 0; |
505 | #else | 505 | #else |
506 | /* needed if we have hwaddress on dhcp iface */ | 506 | /* needed if we have hwaddress on dhcp iface */ |
@@ -519,7 +519,7 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | |||
519 | { | 519 | { |
520 | #if ENABLE_FEATURE_IFUPDOWN_IP | 520 | #if ENABLE_FEATURE_IFUPDOWN_IP |
521 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ | 521 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ |
522 | if (!execute("ip link set[[ address %hwaddress%]] %iface% up", ifd, exec)) | 522 | if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec)) |
523 | return 0; | 523 | return 0; |
524 | #else | 524 | #else |
525 | /* needed if we have hwaddress on dhcp iface */ | 525 | /* needed if we have hwaddress on dhcp iface */ |