diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-07 12:08:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-07 12:08:14 +0200 |
| commit | 812bb6ac4cf8067ca45f1c2557d1a1b2a1b166fe (patch) | |
| tree | 40950d6a17f1f396fdd1ddb3f914fdd994689ba1 /src/conf_mode | |
| parent | be84bbdf276ccb35b527546e5e99e14f124ce235 (diff) | |
| parent | c2b0381a0c26d82288fcc39f9fba1f3c25132aec (diff) | |
| download | vyos-1x-812bb6ac4cf8067ca45f1c2557d1a1b2a1b166fe.tar.gz vyos-1x-812bb6ac4cf8067ca45f1c2557d1a1b2a1b166fe.zip | |
Merge pull request #3268 from vyos/mergify/bp/sagitta/pr-3263
ipoe: T6205: error in migration script logic while renaming mac-address to mac node (backport #3263)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/service_ipoe-server.py | 4 |
1 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 852b714eb..11e950782 100755 --- a/src/conf_mode/service_ipoe-server.py +++ b/src/conf_mode/service_ipoe-server.py @@ -68,8 +68,8 @@ def verify(ipoe): for interface, iface_config in ipoe['interface'].items(): verify_interface_exists(interface) if 'client_subnet' in iface_config and 'vlan' in iface_config: - raise ConfigError('Option "client-subnet" incompatible with "vlan"!' - 'Use "ipoe client-ip-pool" instead.') + raise ConfigError('Option "client-subnet" and "vlan" are mutually exclusive, ' + 'use "client-ip-pool" instead!') verify_accel_ppp_authentication(ipoe, local_users=False) verify_accel_ppp_ip_pool(ipoe) |