Ver código fonte

comgt: in directip, derive the wwan ifname automatically instead of specifying it in the config

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 42669
Felix Fietkau 11 anos atrás
pai
commit
45bd5ebfef
1 arquivos alterados com 6 adições e 3 exclusões
  1. 6 3
      package/network/utils/comgt/files/directip.sh

+ 6 - 3
package/network/utils/comgt/files/directip.sh

@@ -8,7 +8,6 @@ proto_directip_init_config() {
 	available=1
 	no_device=1
 	proto_config_add_string "device:device"
-	proto_config_add_string "ifname"
 	proto_config_add_string "apn"
 	proto_config_add_string "pincode"
 	proto_config_add_string "auth"
@@ -18,10 +17,10 @@ proto_directip_init_config() {
 
 proto_directip_setup() {
 	local interface="$1"
-	local chat
+	local chat devpath devname
 
 	local device apn pincode ifname auth username password
-	json_get_vars device apn pincode ifname auth username password
+	json_get_vars device apn pincode auth username password
 
 	[ -e "$device" ] || {
 		proto_notify_error "$interface" NO_DEVICE
@@ -29,6 +28,10 @@ proto_directip_setup() {
 		return 1
 	}
 
+	devname="$(basename "$device")"
+	devpath="$(readlink -f /sys/class/tty/$devname/device)"
+	ifname="$( ls "$devpath"/../../*/net )"
+
 	[ -n "$ifname" ] || {
 		proto_notify_error "$interface" NO_IFNAME
 		proto_set_available "$interface" 0