route: apply static routes on startup and restart

The static routes can only be applied when the network has a valid layer 3  connectivity.
So it is not useful to have a route_init which is called before we have any layer 3  connectivity.
We now call the route_apply every time we set new routes for a zone.
We do this every time we get a new layer 3  connectivity so all routes are applied correctly.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.route b/src/functions/functions.route
index 8fc44d5d0adf151c417a7e248811d75721e36fba..1b6369efbbee15466481b6684ee49221753d247f 100644 (file)
--- a/src/functions/functions.route
+++ b/src/functions/functions.route
@@ -22,13 +22,6 @@
 # Functions for static routing.
 #
 
-route_init() {
-       # Apply configured static routes.
-       route_apply
-}
-
-init_register route_init
-
 route_add() {
        local ${NETWORK_CONFIG_ROUTES_PARAMS}
 

diff --git a/src/functions/functions.routing b/src/functions/functions.routing
index c7aac094f11cdca2c4d88abc8a65df4816666425..24365856f155fbc82b6780891a9fd0d1c79ae4f7 100644 (file)
--- a/src/functions/functions.routing
+++ b/src/functions/functions.routing
@@ -181,4 +181,7 @@ routing_update() {
        cmd ${routing_cmd}
 
        cmd ${ip_cmd} rule add from ${local_ip_address} lookup ${table}
+
+       # Apply all static routes
+       route_apply
 }