diff --git a/dsvpn/files/init b/dsvpn/files/init index 250c409df..1d78ed4be 100755 --- a/dsvpn/files/init +++ b/dsvpn/files/init @@ -49,7 +49,7 @@ start_instance() { key="" if [ "$(uci -q get network.omrvpn)" != "" ] && [ "$(uci -q get network.omrvpn)" != "$dev" ]; then - uci -q set network.omrvpn.ifname=$dev + uci -q set network.omrvpn.device=$dev uci -q commit fi diff --git a/glorytun-udp/init b/glorytun-udp/init index e9f7caf7c..f5086024f 100755 --- a/glorytun-udp/init +++ b/glorytun-udp/init @@ -50,7 +50,7 @@ start_instance() { key="" if [ "$(uci -q get network.omrvpn)" != "" ]; then - uci -q set network.omrvpn.ifname=$dev + uci -q set network.omrvpn.device=$dev uci -q commit fi diff --git a/glorytun/init b/glorytun/init index f5b868323..3d549f0aa 100755 --- a/glorytun/init +++ b/glorytun/init @@ -59,7 +59,7 @@ start_instance() { key="" if [ "$(uci -q get network.omrvpn)" != "" ]; then - uci -q set network.omrvpn.ifname=${dev} + uci -q set network.omrvpn.device=${dev} uci -q commit network fi _log "starting ${PROG_NAME} ${1} instance $*" diff --git a/mlvpn/files/etc/init.d/mlvpn b/mlvpn/files/etc/init.d/mlvpn index 6ef4bfdc6..33f6e75a9 100755 --- a/mlvpn/files/etc/init.d/mlvpn +++ b/mlvpn/files/etc/init.d/mlvpn @@ -13,7 +13,8 @@ interface_multipath_settings() { mode="$(uci -q get openmptcprouter.$config.multipath)" } [ "$mode" = "off" ] || [ "$mode" = "" ] && return 1 - config_get ifname "$config" ifname + config_get ifname "$config" device + [ -z "$ifname" ] && config_get ifname "$config" ifname [ -z "$ifname" ] && ifname=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]') [ -n "$(echo $ifname | grep '@')" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["device"]') [ -z "$ifname" ] && return 1 @@ -46,7 +47,7 @@ start() { firstport="$(uci -q get mlvpn.general.firstport)" if [ "$(uci -q get network.omrvpn)" != "${interface_name}" ]; then - uci -q set network.omrvpn.ifname=${interface_name} + uci -q set network.omrvpn.device=${interface_name} uci -q commit fi