diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-04-06 13:54:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-06 13:54:30 +0200 |
| commit | c55754fd5fe69a44ea33830d60342b894768af58 (patch) | |
| tree | 1fecf06b5ff61f77a776bc9f953d9a2dcf2098e5 /src/conf_mode | |
| parent | 4f8eeee98e4929cecc601e10c460bb476165ce21 (diff) | |
| parent | a5ccc06c08d3a9696f1c03c8d0c7de78ce1fd3c5 (diff) | |
| download | vyos-1x-c55754fd5fe69a44ea33830d60342b894768af58.tar.gz vyos-1x-c55754fd5fe69a44ea33830d60342b894768af58.zip | |
Merge pull request #3263 from c-po/T6205-ipoe
ipoe: T6205: error in migration script logic while renaming mac-address to mac node
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) |