Fixup OpenWrt 23.05 network configuration changes #304

fbl · 2024-01-25T18:15:02+01:00

fbl commented

2024-01-25 18:15:02 +01:00

A few particulares were missed during the upgrade to OpenWrt 23.05:

The cpuport of FritzBox 4040 has to be removed
The network configuration of TP-Link TL-WDR4900 must be migrated to DSA
- The compat_version has to be retained, simliar to FritzBox 4040
A migration script for the DSA network changes has to be added and the config_version bumped

A few particulares were missed during the upgrade to OpenWrt 23.05: - The cpuport of FritzBox 4040 has to be removed - The network configuration of TP-Link TL-WDR4900 must be migrated to DSA - The compat_version has to be retained, simliar to FritzBox 4040 - A migration script for the DSA network changes has to be added and the config_version bumped

fbl added this to the 20240401-beta milestone 2024-01-25 18:15:02 +01:00

fbl added 5 commits 2024-01-25 18:15:02 +01:00

bd17defba1 fff-layer3-config: bump config_version

With OpenWrt 23.05 a few more devices have been migrated to DSA. Bump
the config_version of layer3-config to reflect the necessary migration.

Signed-off-by: Fabian Bläse <fabian@blaese.de>

5f619cb08d fff-network: add missing cpuport case for the FritzBox 4040

When adjusting our configuration for the DSA migration of the FritzBox
4040, the cpuport was forgotten. The cpuport has to be removed for DSA
devices.

Signed-off-by: Fabian Bläse <fabian@blaese.de>

a60c018de6 fff-network: adjust network configuration of TP-Link TL-WDR4900 for DSA

the TL-WDR4900 was migrated to a DSA driver with OpenWrt 23.05. Adjust
our network configuration accordingly.

Fixes: #302

Signed-off-by: Fabian Bläse <fabian@blaese.de>

6586cc8944 mpc85xx: retain old compat_version for sysupgrade compatibility

OpenWrt images contain a compat_version, which is used to block upgrades
to newer versions with incompatible configuration, if the configuration
cannot be migrated.

As we maintain our own configuration and all OpenWrt configuration files
are dropped on an upgrade, this upgrade block is not required.

To simplify the upgrade process, retain the old compat_version for the
next sysupgrade release. The compat_version will then be bumped
automatically by the `05_compat-version` board.d script.

Signed-off-by: Fabian Bläse <fabian@blaese.de>

ci/woodpecker/pr/woodpecker Pipeline was successful Details

da0a853e69 layer3-config: Add DSA migration script for migrated devices

Because of to the switch from swconfig to DSA, the switchport names
have to be migrated for a few devices. Due to past migrations, we
already have developed a migration script for that.

Duplicate and adjust the script for the newly migrated devices. While at
it, rename the old script to reflect the configuration version bump.

Fixes: #301

Signed-off-by: Fabian Bläse <fabian@blaese.de>

fbl commented

2024-02-22 14:25:54 +01:00

applied.

fbl closed this pull request

2024-02-22 14:25:54 +01:00

ci/woodpecker/pr/woodpecker Pipeline was successful

Details