diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-04-17 14:47:12 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-04-17 14:47:12 +0000 |
| commit | 0d1b5a1fd2359949cd7b3cddce76f6f248758ed9 (patch) | |
| tree | 6b86d06e139ed5ac470700f66591370e98e366a5 | |
| parent | 22045c383dc32f620a5da8909a98a58320926e02 (diff) | |
| download | upstream-0d1b5a1fd2359949cd7b3cddce76f6f248758ed9.tar.gz upstream-0d1b5a1fd2359949cd7b3cddce76f6f248758ed9.tar.bz2 upstream-0d1b5a1fd2359949cd7b3cddce76f6f248758ed9.zip | |
network: also shorten virtual interface names of ppp and 3g/4g connections
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45479
5 files changed, 9 insertions, 9 deletions
diff --git a/package/network/services/ppp/files/lib/netifd/ppp-up b/package/network/services/ppp/files/lib/netifd/ppp-up index f9bfe62383..105ecbe844 100755 --- a/package/network/services/ppp/files/lib/netifd/ppp-up +++ b/package/network/services/ppp/files/lib/netifd/ppp-up @@ -22,7 +22,7 @@ proto_send_update "$PPP_IPPARAM" if [ -n "$AUTOIPV6" ]; then json_init - json_add_string name "${PPP_IPPARAM}_dhcpv6" + json_add_string name "${PPP_IPPARAM}_6" json_add_string ifname "@$PPP_IPPARAM" json_add_string proto "dhcpv6" json_close_object diff --git a/package/network/utils/comgt/files/directip.sh b/package/network/utils/comgt/files/directip.sh index a633fa2e15..66d92a7c2c 100644 --- a/package/network/utils/comgt/files/directip.sh +++ b/package/network/utils/comgt/files/directip.sh @@ -77,13 +77,13 @@ proto_directip_setup() { proto_send_update "$interface" json_init - json_add_string name "${interface}_dhcp" + json_add_string name "${interface}_4" json_add_string ifname "@$interface" json_add_string proto "dhcp" ubus call network add_dynamic "$(json_dump)" json_init - json_add_string name "${interface}_dhcpv6" + json_add_string name "${interface}_6" json_add_string ifname "@$interface" json_add_string proto "dhcpv6" ubus call network add_dynamic "$(json_dump)" diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh index 4c3f161f98..6546691b1a 100644 --- a/package/network/utils/comgt/files/ncm.sh +++ b/package/network/utils/comgt/files/ncm.sh @@ -120,13 +120,13 @@ proto_ncm_setup() { proto_send_update "$interface" json_init - json_add_string name "${interface}_dhcp" + json_add_string name "${interface}_4" json_add_string ifname "@$interface" json_add_string proto "dhcp" ubus call network add_dynamic "$(json_dump)" json_init - json_add_string name "${interface}_dhcpv6" + json_add_string name "${interface}_6" json_add_string ifname "@$interface" json_add_string proto "dhcpv6" ubus call network add_dynamic "$(json_dump)" diff --git a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh index 010a3a2527..461e5fa20c 100755 --- a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh +++ b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh @@ -127,14 +127,14 @@ proto_mbim_setup() { proto_send_update "$interface" json_init - json_add_string name "${interface}_dhcp" + json_add_string name "${interface}_4" json_add_string ifname "@$interface" json_add_string proto "dhcp" json_close_object ubus call network add_dynamic "$(json_dump)" json_init - json_add_string name "${interface}_dhcpv6" + json_add_string name "${interface}_6" json_add_string ifname "@$interface" json_add_string proto "dhcpv6" ubus call network add_dynamic "$(json_dump)" diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh index ae6aa730a6..9ae60169ea 100755 --- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh +++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh @@ -118,14 +118,14 @@ proto_qmi_setup() { proto_send_update "$interface" json_init - json_add_string name "${interface}_dhcp" + json_add_string name "${interface}_4" json_add_string ifname "@$interface" json_add_string proto "dhcp" json_close_object ubus call network add_dynamic "$(json_dump)" json_init - json_add_string name "${interface}_dhcpv6" + json_add_string name "${interface}_6" json_add_string ifname "@$interface" json_add_string proto "dhcpv6" json_close_object |