summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-04-30 20:57:43 +0200
committerGitHub <noreply@github.com>2024-04-30 20:57:43 +0200
commit1e8c98e04ee305b72317efb41fedabbfb71b2350 (patch)
tree60d8566af6d1e7206408b0cce386a67b85c7282e
parent07826e81b35eb6f94aec37bcf71b64a80ad228de (diff)
parent626b3238051143874cbf64f55c8d4ca4993da399 (diff)
downloadvyos-1x-1e8c98e04ee305b72317efb41fedabbfb71b2350.tar.gz
vyos-1x-1e8c98e04ee305b72317efb41fedabbfb71b2350.zip
Merge pull request #3381 from vyos/mergify/bp/sagitta/pr-3368
T6267: Check interface wireless module before apply config (backport #3368)
-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)