treewide: reorder layer3-specific uci-default scripts #212

fbl · 2022-03-03T21:55:45+01:00

fbl commented

2022-03-03 21:55:45 +01:00

With a recent patchset the initial boot process of the fff-network
package has been significantly altered. The base network configuration
is now generated by a uci-defaults script which completely drops
any existing network configuration first (22-network-base).

Reorder some uci-defaults scripts which extend the base network
configuration with layer3-specific rules, so they are executed after
22-network-base.

With a recent patchset the initial boot process of the fff-network package has been significantly altered. The base network configuration is now generated by a uci-defaults script which completely drops any existing network configuration first (22-network-base). Reorder some uci-defaults scripts which extend the base network configuration with layer3-specific rules, so they are executed after 22-network-base.

fbl added this to the 20220405-beta milestone 2022-03-03 21:55:45 +01:00

fbl added 4 commits 2022-03-03 21:55:46 +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>

2d28b8943e treewide: reorder layer3-specific uci-default scripts

With a recent patchset the initial boot process of the fff-network
package has been significantly altered. The base network configuration
is now generated by a uci-defaults script which completely drops
any existing network configuration first (22-network-base).

Reorder some uci-defaults scripts which extend the base network
configuration with layer3-specific rules, so they are executed after
22-network-base.

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

fbl added a new dependency 2022-03-03 21:55:59 +01:00

#209 Rework network configuration

rohammer approved these changes 2022-03-03 23:22:14 +01:00

rohammer left a comment

Hi,
fuer den reorder patch:

Reviewed-by: Robert Langhammer <rlanghammer@web.de>

Hi, fuer den reorder patch: ``` Reviewed-by: Robert Langhammer <rlanghammer@web.de> ```

jkimmel commented

2022-03-04 03:12:49 +01:00

Kann das hier zu? #213 scheint mir das gleiche mit einem extra commit zu sein.

fbl commented

2022-03-04 10:22:39 +01:00

Eigentlich hatte ich die zwei Dinge absichtlich getrennt, damit man das einzeln reviewen kann. Das gitea hat leider keine Möglichkeit aufeinander aufbauende Pull Requests abzubilden, daher zeigt es immer den master..PR Diff an. Da diese beiden Pull Requests auf #209 aufbauen, sind dessen Commits leider auch immer enthalten.

Hier ist nur der letzte Commit interessant, in #213 die letzten beiden.

Eigentlich hatte ich die zwei Dinge absichtlich getrennt, damit man das einzeln reviewen kann. Das gitea hat leider keine Möglichkeit aufeinander aufbauende Pull Requests abzubilden, daher zeigt es immer den `master..PR` Diff an. Da diese beiden Pull Requests auf #209 aufbauen, sind dessen Commits leider auch immer enthalten. Hier ist nur der letzte Commit interessant, in #213 die letzten beiden.

fbl commented

2022-03-05 19:26:25 +01:00

Auf meinen staging tree applied.

fbl closed this pull request

2022-03-05 19:26:25 +01:00

fbl deleted branch reorder-ucidef

2022-03-05 19:26:28 +01:00