summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-04-30 20:21:39 +0200
committerGitHub <noreply@github.com>2024-04-30 20:21:39 +0200
commitb111c6c1bc552dba7fdb5373ea9108ba336daedf (patch)
tree5a05e324b22b3d7aa4335573a6b0e9f658368017
parentb2a320d5f714aa2ecfe75cd87fe9a0654932bde5 (diff)
parent09c302d7e57a0fdb6c51ae8f61d5ad6371a30b67 (diff)
downloadvyos-1x-b111c6c1bc552dba7fdb5373ea9108ba336daedf.tar.gz
vyos-1x-b111c6c1bc552dba7fdb5373ea9108ba336daedf.zip
Merge pull request #3368 from sever-sever/T6267
T6267: Check interface wireless module before apply config
-rwxr-xr-xsrc/conf_mode/interfaces_wireless.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces_wireless.py b/src/conf_mode/interfaces_wireless.py
index 02b4a2500..c0a17c0bc 100755
--- a/src/conf_mode/interfaces_wireless.py
+++ b/src/conf_mode/interfaces_wireless.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2019-2020 VyOS maintainers and contributors
+# Copyright (C) 2019-2024 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -31,8 +31,9 @@ from vyos.configverify import verify_vrf
from vyos.configverify import verify_bond_bridge_member
from vyos.ifconfig import WiFiIf
from vyos.template import render
-from vyos.utils.process import call
from vyos.utils.dict import dict_search
+from vyos.utils.kernel import check_kmod
+from vyos.utils.process import call
from vyos import ConfigError
from vyos import airbag
airbag.enable()
@@ -118,6 +119,10 @@ def verify(wifi):
if 'physical_device' not in wifi:
raise ConfigError('You must specify a physical-device "phy"')
+ physical_device = wifi['physical_device']
+ if not os.path.exists(f'/sys/class/ieee80211/{physical_device}'):
+ raise ConfigError(f'Wirelss interface PHY "{physical_device}" does not exist!')
+
if 'type' not in wifi:
raise ConfigError('You must specify a WiFi mode')
@@ -266,6 +271,7 @@ def apply(wifi):
if __name__ == '__main__':
try:
+ check_kmod('mac80211')
c = get_config()
verify(c)
generate(c)