fff-network: remove hardcoded network config #213

Closed
fbl wants to merge 5 commits from fbl:remove-baseconfig into master
Owner

With the recent rework of the network configuration, any existing configuration is dropped in a uci-defaults script (22-network-base) and generated from scratch.

When rebasing this rather old patchset, the packet_steering option was overlooked, so it is missing now.
Restore the removed packet_steering option by setting it using a dedicated uci-defaults script.

Now that all network configuration is generated using uci-defaults scripts, the hardcoded /etc/config/network configuration file is not required anymore. Remove it.

With the recent rework of the network configuration, any existing configuration is dropped in a uci-defaults script (22-network-base) and generated from scratch. When rebasing this rather old patchset, the packet_steering option was overlooked, so it is missing now. Restore the removed packet_steering option by setting it using a dedicated uci-defaults script. Now that all network configuration is generated using uci-defaults scripts, the hardcoded /etc/config/network configuration file is not required anymore. Remove it.
fbl added this to the 20220405-beta milestone 2022-03-03 22:28:11 +01:00
fbl added 5 commits 2022-03-03 22:28:11 +01:00
50d67142c7 fff-network: Replace runtime configuration with reload_config
Instead of both setting values in the uci configuration and applying
them manually, only set the values in the uci configuration and do a
combined reload_config afterward.

This not only ensures that the changes to the configuration are actually
correct, but also decreases the runtime of configurenetwork.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
1f0ec0be24 fff-network: Remove unnecessary restart of fff-uradvd
The explicit restat of fff-uradvd is not necessary anymore, as
appropriate procd reload triggers have been added, and reload_config is
executed after every run of configurenetwork.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
3fb735cfdf Remove static configuration from dynamic script
Most of the configuration done in configurenetwork is static and does
not change after the first boot. Move this static configuration into a
uci-defaults script, which is only executed on first boot.

Configuration which might be changed at runtime (e.g. port assignment),
is kept in the configurenetwork script.

To improve readability and speed, combine multiple uci commands into a
uci batch. Drop any existing network configuration before applying our
own configuration. This requires the network.globals section to be
created explicitly. Also, the fdff:: addresses, ETHMESHMAC and ROUTERMAC
can be set unconditionally, as the uci-defaults script is only executed
once. Other than that, the static configuration has not been altered.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
96c4c562cb fff-network: Restore accidentally removed packet_steering option
With the recent rework of the network configuration, any existing
configuration is dropped in a uci-defaults script (22-network-base) and
generated from scratch. When rebasing this rather old patchset, the
packet_steering option was overlooked, so it is missing now.

Restore the removed packet_steering option by setting it using a
dedicated uci-defaults script.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
07c5e90c58 fff-network: remove hardcoded network config
The base network configuration has been completely migrated to
uci-defaults scripts and any existing network configuration is dropped.

Therefore, the hardcoded /etc/config/network configuration file is not
required anymore. Remove it.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
fbl added a new dependency 2022-03-03 22:28:24 +01:00
rohammer approved these changes 2022-03-03 23:26:42 +01:00
rohammer left a comment
Member

Hi,

Reviewed-by: Robert Langhammer <rlanghammer@web.de>
Hi, ``` Reviewed-by: Robert Langhammer <rlanghammer@web.de> ```
Author
Owner

Auf meinen staging tree applied.

Auf meinen staging tree applied.
fbl closed this pull request 2022-03-05 19:26:42 +01:00
fbl deleted branch remove-baseconfig 2022-03-05 19:26:46 +01:00

Pull request closed

Sign in to join this conversation.
No description provided.