Author: cyrus Date: 2015-04-17 16:47:12 +0200 (Fri, 17 Apr 2015) New Revision: 45479
Modified: trunk/package/network/services/ppp/files/lib/netifd/ppp-up trunk/package/network/utils/comgt/files/directip.sh trunk/package/network/utils/comgt/files/ncm.sh trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh Log: network: also shorten virtual interface names of ppp and 3g/4g connections Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/services/ppp/files/lib/netifd/ppp-up =================================================================== --- trunk/package/network/services/ppp/files/lib/netifd/ppp-up 2015-04-17 13:47:13 UTC (rev 45478) +++ trunk/package/network/services/ppp/files/lib/netifd/ppp-up 2015-04-17 14:47:12 UTC (rev 45479) @@ -22,7 +22,7 @@ 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 Modified: trunk/package/network/utils/comgt/files/directip.sh =================================================================== --- trunk/package/network/utils/comgt/files/directip.sh 2015-04-17 13:47:13 UTC (rev 45478) +++ trunk/package/network/utils/comgt/files/directip.sh 2015-04-17 14:47:12 UTC (rev 45479) @@ -77,13 +77,13 @@ 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)" Modified: trunk/package/network/utils/comgt/files/ncm.sh =================================================================== --- trunk/package/network/utils/comgt/files/ncm.sh 2015-04-17 13:47:13 UTC (rev 45478) +++ trunk/package/network/utils/comgt/files/ncm.sh 2015-04-17 14:47:12 UTC (rev 45479) @@ -120,13 +120,13 @@ 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)" Modified: trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh =================================================================== --- trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh 2015-04-17 13:47:13 UTC (rev 45478) +++ trunk/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh 2015-04-17 14:47:12 UTC (rev 45479) @@ -127,14 +127,14 @@ 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)" Modified: trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh =================================================================== --- trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh 2015-04-17 13:47:13 UTC (rev 45478) +++ trunk/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh 2015-04-17 14:47:12 UTC (rev 45479) @@ -118,14 +118,14 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
