summaryrefslogtreecommitdiff
path: root/python/vyos/util.py
diff options
context:
space:
mode:
authorMarcus Hoff <marcus.hoff@ring2.dk>2020-09-20 11:59:32 +0200
committerMarcus Hoff <marcus.hoff@ring2.dk>2020-09-20 11:59:32 +0200
commit45b30adfaaec7065f768d04085138a75a76ed376 (patch)
treea9cd47236468077141eee56068ba23027b0d4c7d /python/vyos/util.py
parent46fb580fa0131f6815bbcfc95631654f6fe999a8 (diff)
parente0797331774a02ca23e8363fbcfe5a49fb3ca2bd (diff)
downloadvyos-1x-45b30adfaaec7065f768d04085138a75a76ed376.tar.gz
vyos-1x-45b30adfaaec7065f768d04085138a75a76ed376.zip
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'python/vyos/util.py')
-rw-r--r--python/vyos/util.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 84aa16791..79e11a86d 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -654,6 +654,7 @@ def get_bridge_member_config(conf, br, intf):
def check_kmod(k_mod):
""" Common utility function to load required kernel modules on demand """
+ from vyos import ConfigError
if isinstance(k_mod, str):
k_mod = k_mod.split()
for module in k_mod: