diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-06 11:24:49 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-04-06 13:18:49 +0200 |
| commit | a5ccc06c08d3a9696f1c03c8d0c7de78ce1fd3c5 (patch) | |
| tree | 9ced77b6db5f1e53a783ce9cbe0d84e26de4d6e7 /src/conf_mode/service_ipoe-server.py | |
| parent | 71786307eed6a0ebb42755f24c19dfd46b1b9696 (diff) | |
| download | vyos-1x-a5ccc06c08d3a9696f1c03c8d0c7de78ce1fd3c5.tar.gz vyos-1x-a5ccc06c08d3a9696f1c03c8d0c7de78ce1fd3c5.zip | |
ipoe: T6205: error in migration script logic while renaming mac-address to mac node
The problem was introduced in [1] but the config migrator part unfortunately
was added to the wrong version [2]. As IPoE config version 0 was only active
during the 1.3 development cycle and VyOS 1.3.0 was already released with config
version 1 we can safely drop the migrator 0-to-1 and move the code to 1-to-2 to
properly support upgrades from VyOS 1.3 -> 1.4 or newer.
1: https://github.com/vyos/vyos-1x/commit/05df2a5f021f0c7aab7c06db645d210858b6e98d#diff-08291bf77870abe3af8bbe3e8ce4bbf344fd0498b2c5c75a75aa7235d381c88eL168
2: https://github.com/vyos/vyos-1x/commit/05df2a5f021f0c7aab7c06db645d210858b6e98d#diff-b8bb58b75607d3653e74d82eff02442f9f3ab82698f160ba37858f7cdf6c79ccR44-R46
Diffstat (limited to 'src/conf_mode/service_ipoe-server.py')
| -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) |