From ecc7067479d165f4178f04248d86898cf50e3d95 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 20 Jun 2019 23:09:01 +0200 Subject: [PATCH] Do not try to start Bird during boot process 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 --- src/functions/functions.bird | 14 -------------- src/network | 3 --- 2 files changed, 17 deletions(-) diff --git a/src/functions/functions.bird b/src/functions/functions.bird index 1bbac8cd..55d43b58 100644 --- a/src/functions/functions.bird +++ b/src/functions/functions.bird @@ -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 diff --git a/src/network b/src/network index be06d8a2..30f87a0e 100644 --- a/src/network +++ b/src/network @@ -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" ;; -- 2.39.2