diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-29 17:50:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 17:50:00 +0200 |
| commit | 7edaf47f0f582459d5324da39cd0da0937c30fa9 (patch) | |
| tree | 24e486bb064d8fbcfb127b1f72ba4a1c6575ccb4 /src/conf_mode | |
| parent | c1507d684cc9e0aaabf45bf9d5ef39d741b96c81 (diff) | |
| parent | 1b64d0522cbd45bf919f15bccd5721773940aef3 (diff) | |
| download | vyos-1x-7edaf47f0f582459d5324da39cd0da0937c30fa9.tar.gz vyos-1x-7edaf47f0f582459d5324da39cd0da0937c30fa9.zip | |
Merge pull request #3376 from vyos/mergify/bp/sagitta/pr-3375
T6272: Changed interface existence verification in pppoe/ipoe to Warning (backport #3375)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/service_ipoe-server.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/service_pppoe-server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py index 11e950782..28b7fb03c 100755 --- a/src/conf_mode/service_ipoe-server.py +++ b/src/conf_mode/service_ipoe-server.py @@ -66,7 +66,7 @@ def verify(ipoe): raise ConfigError('No IPoE interface configured') for interface, iface_config in ipoe['interface'].items(): - verify_interface_exists(interface) + verify_interface_exists(interface, warning_only=True) if 'client_subnet' in iface_config and 'vlan' in iface_config: raise ConfigError('Option "client-subnet" and "vlan" are mutually exclusive, ' 'use "client-ip-pool" instead!') diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py index b9d174933..328487985 100755 --- a/src/conf_mode/service_pppoe-server.py +++ b/src/conf_mode/service_pppoe-server.py @@ -105,7 +105,7 @@ def verify(pppoe): # Check is interface exists in the system for interface in pppoe['interface']: - verify_interface_exists(interface) + verify_interface_exists(interface, warning_only=True) return None |