network: also shorten virtual interface names of ppp and 3g/4g connections

Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45479 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/services/ppp/files/lib/netifd/ppp-up b/package/network/services/ppp/files/lib/netifd/ppp-up
index f9bfe62..105ecbe 100755 (executable)
--- 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 a633fa2..66d92a7 100644 (file)
--- 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 4c3f161..6546691 100644 (file)
--- 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 010a3a2..461e5fa 100755 (executable)
--- 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 ae6aa73..9ae6016 100755 (executable)
--- 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