diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-06 11:24:49 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-04-06 21:16:22 +0200 |
| commit | 4ad1185536756890295fdd8b566fb65a75ef429d (patch) | |
| tree | 09ee792782daa47634419e5dfdcccae081729d32 /smoketest/configs | |
| parent | 7dc280fc9de5dcd2a44820a64f7c5220e6811bd4 (diff) | |
| download | vyos-1x-4ad1185536756890295fdd8b566fb65a75ef429d.tar.gz vyos-1x-4ad1185536756890295fdd8b566fb65a75ef429d.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
(cherry picked from commit a5ccc06c08d3a9696f1c03c8d0c7de78ce1fd3c5)
Diffstat (limited to 'smoketest/configs')
| -rw-r--r-- | smoketest/configs/ipoe-server | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/smoketest/configs/ipoe-server b/smoketest/configs/ipoe-server index a375e91de..fdd554b7d 100644 --- a/smoketest/configs/ipoe-server +++ b/smoketest/configs/ipoe-server @@ -56,7 +56,6 @@ service { } } interface eth1 { - client-subnet 192.168.0.0/24 network vlan network-mode L3 vlan-id 100 @@ -64,9 +63,6 @@ service { vlan-range 1000-2000 vlan-range 2500-2700 } - interface eth2 { - client-subnet 192.168.1.0/24 - } name-server 10.10.1.1 name-server 10.10.1.2 name-server 2001:db8:aaa:: @@ -94,11 +90,11 @@ system { } } ntp { - server 0.pool.ntp.org { + server time1.vyos.net { } - server 1.pool.ntp.org { + server time2.vyos.net { } - server 2.pool.ntp.org { + server time3.vyos.net { } } syslog { |