network: also shorten virtual interface names of ppp and 3g/4g connections
authorSteven Barth <cyrus@openwrt.org>
Fri, 17 Apr 2015 14:47:12 +0000 (14:47 +0000)
committerSteven Barth <cyrus@openwrt.org>
Fri, 17 Apr 2015 14:47:12 +0000 (14:47 +0000)
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45479

package/network/services/ppp/files/lib/netifd/ppp-up
package/network/utils/comgt/files/directip.sh
package/network/utils/comgt/files/ncm.sh
package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh

index f9bfe62..105ecbe 100755 (executable)
@@ -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
index a633fa2..66d92a7 100644 (file)
@@ -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)"
index 4c3f161..6546691 100644 (file)
@@ -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)"
index 010a3a2..461e5fa 100755 (executable)
@@ -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)"
index ae6aa73..9ae6016 100755 (executable)
@@ -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