Do not try to start Bird during boot process
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Jun 2019 21:09:01 +0000 (23:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Jun 2019 21:09:01 +0000 (23:09 +0200)
We should not do this in the network script and let just
systemd take care of this. Otherwise we would end up in
an infinite loop during the boot process.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/functions/functions.bird
src/network

index 1bbac8c..55d43b5 100644 (file)
@@ -33,20 +33,6 @@ bird_reload() {
        service_reload "bird.service"
 }
 
-bird_enable() {
-       # Generate configuration file
-       if ! bird_generate_config; then
-               log ERROR "Could not write Bird configuration"
-               return ${EXIT_ERROR}
-       fi
-
-       # Enable the service to be automatically started next time
-       service_enable "bird.service"
-
-       # Start it now
-       bird_start
-}
-
 # Update configuration any apply it in one go
 bird_update() {
        if ! bird_generate_config; then
index be06d8a..30f87a0 100644 (file)
@@ -1381,9 +1381,6 @@ case "${action}" in
                # Update resolv.conf(5) when initializing the network
                dns_generate_resolvconf
 
-               # Make sure bird is running
-               bird_enable
-
                # Also execute all triggers
                triggers_execute_all "init"
                ;;