diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-01 03:10:51 +0300 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-01 03:10:51 +0300 |
| commit | 44d5dcebc6d3d896e8a5de07cb57913d961067c8 (patch) | |
| tree | 41dd0bcbc7569f16f3964b09bc5ebeb5f9176024 /networking/ifupdown.c | |
| parent | 64974793b9fe0921c43e604de747caf7d32f671c (diff) | |
iplink: accept shorthands for "address" keyword here:
"ip link set address 00:11:22:33:44:55"
ifupdown: use "addr" instead of "address"
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) int result; #if ENABLE_FEATURE_IFUPDOWN_IP 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 link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec); /* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */ result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec); #else @@ -433,7 +433,7 @@ static int static_up(struct interface_defn_t *ifd, execfn *exec) #if ENABLE_FEATURE_IFUPDOWN_IP result = execute("ip addr add %address%/%bnmask%[[ broadcast %broadcast%]] " "dev %iface%[[ peer %pointopoint%]][[ label %label%]]", ifd, exec); - result += execute("ip link set[[ mtu %mtu%]][[ address %hwaddress%]] %iface% up", ifd, exec); + result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec); result += execute("[[ip route add default via %gateway% dev %iface%]]", ifd, exec); return ((result == 3) ? 3 : 0); #else @@ -500,7 +500,7 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) unsigned i; #if ENABLE_FEATURE_IFUPDOWN_IP /* ip doesn't up iface when it configures it (unlike ifconfig) */ - if (!execute("ip link set[[ address %hwaddress%]] %iface% up", ifd, exec)) + if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec)) return 0; #else /* needed if we have hwaddress on dhcp iface */ @@ -519,7 +519,7 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) { #if ENABLE_FEATURE_IFUPDOWN_IP /* ip doesn't up iface when it configures it (unlike ifconfig) */ - if (!execute("ip link set[[ address %hwaddress%]] %iface% up", ifd, exec)) + if (!execute("ip link set[[ addr %hwaddress%]] %iface% up", ifd, exec)) return 0; #else /* needed if we have hwaddress on dhcp iface */ |