summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2025-06-10 15:58:22 +0100
committerGitHub <noreply@github.com>2025-06-10 15:58:22 +0100
commitbd93800b90c18149d152fbff52d824eb3c1ff160 (patch)
treea09404e3098a0598ba7e35058045b31a2dc807a0 /src
parenta3b5108391bc457e741a21ed0121af52928489f1 (diff)
parent77b999e897b088bb990324d511b6f190073abd71 (diff)
downloadvyos-1x-bd93800b90c18149d152fbff52d824eb3c1ff160.tar.gz
vyos-1x-bd93800b90c18149d152fbff52d824eb3c1ff160.zip
Merge pull request #4527 from cblackburn-igl/current
T7492: Fix modem connection code
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/interfaces_wwan.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces_wwan.py b/src/conf_mode/interfaces_wwan.py
index ddbebfb4a..fb71731d8 100755
--- a/src/conf_mode/interfaces_wwan.py
+++ b/src/conf_mode/interfaces_wwan.py
@@ -29,6 +29,7 @@ from vyos.configverify import verify_vrf
from vyos.configverify import verify_mtu_ipv6
from vyos.ifconfig import WWANIf
from vyos.utils.dict import dict_search
+from vyos.utils.network import is_wwan_connected
from vyos.utils.process import cmd
from vyos.utils.process import call
from vyos.utils.process import DEVNULL
@@ -137,7 +138,7 @@ def apply(wwan):
break
sleep(0.250)
- if 'shutdown_required' in wwan:
+ if 'shutdown_required' in wwan or (not is_wwan_connected(wwan['ifname'])):
# we only need the modem number. wwan0 -> 0, wwan1 -> 1
modem = wwan['ifname'].lstrip('wwan')
base_cmd = f'mmcli --modem {modem}'
@@ -159,7 +160,7 @@ def apply(wwan):
return None
- if 'shutdown_required' in wwan:
+ if 'shutdown_required' in wwan or (not is_wwan_connected(wwan['ifname'])):
ip_type = 'ipv4'
slaac = dict_search('ipv6.address.autoconf', wwan) != None
if 'address' in wwan: