summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-09-29 15:39:40 +0200
committerGitHub <noreply@github.com>2023-09-29 15:39:40 +0200
commitb37b0fceb4915fa1e563e34b1e3af1040f461d58 (patch)
tree477a4482800b262334c788f432861e22878c4e53 /src/conf_mode
parent400df973d3518e9f18cb84b52ca89e08a399e461 (diff)
parent42ff4d8a7ba7d01037a1e985cb803cd3355a33f2 (diff)
downloadvyos-1x-b37b0fceb4915fa1e563e34b1e3af1040f461d58.tar.gz
vyos-1x-b37b0fceb4915fa1e563e34b1e3af1040f461d58.zip
Merge pull request #2324 from sarthurdev/fw_configdep
conntrack: T5376: Fix conntrack-sync vyos.configdep issues
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/conntrack.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/conf_mode/conntrack.py b/src/conf_mode/conntrack.py
index 2c5fa335e..4cece6921 100755
--- a/src/conf_mode/conntrack.py
+++ b/src/conf_mode/conntrack.py
@@ -212,7 +212,12 @@ def apply(conntrack):
module_str = ' '.join(rm_modules)
cmd(f'rmmod {module_str}')
- call_dependents()
+ try:
+ call_dependents()
+ except ConfigError:
+ # Ignore config errors on dependent due to being called too early. Example:
+ # ConfigError("ConfigError('Interface ethN requires an IP address!')")
+ pass
# We silently ignore all errors
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1264080