diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-08-26 17:31:55 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-08-26 17:31:55 +0200 |
| commit | d55d3bfb99a41687dedd983a2e752a65526830e0 (patch) | |
| tree | 05da1279380e57f18605a509752a152955135525 | |
| parent | 1b77b2e5f882b0f8ca036843a9c9b88008d2696c (diff) | |
| download | vyos-build-d55d3bfb99a41687dedd983a2e752a65526830e0.tar.gz vyos-build-d55d3bfb99a41687dedd983a2e752a65526830e0.zip | |
T441: enable frr.service and disable watchfrr
The issue with current watchfrr is that it restarts all daemons
even if only one failed.
| -rwxr-xr-x | data/live-build-config/hooks/18-enable-disable_services.chroot | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/30-frr-configs.chroot | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/data/live-build-config/hooks/18-enable-disable_services.chroot b/data/live-build-config/hooks/18-enable-disable_services.chroot index fe30c95f..0a7c2f94 100755 --- a/data/live-build-config/hooks/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/18-enable-disable_services.chroot @@ -32,3 +32,5 @@ systemctl disable udp-broadcast-relay{1.99} /usr/sbin/update-rc.d -f udp-broadcast-relay remove systemctl disable pdns-recursor /usr/sbin/update-rc.d -f pdns-recursor remove + +systemctl enable frr.service diff --git a/data/live-build-config/hooks/30-frr-configs.chroot b/data/live-build-config/hooks/30-frr-configs.chroot index d080c42a..b2a715d3 100755 --- a/data/live-build-config/hooks/30-frr-configs.chroot +++ b/data/live-build-config/hooks/30-frr-configs.chroot @@ -48,7 +48,7 @@ pbrd_options=" --daemon -A 127.0.0.1" staticd_options=" --daemon -A 127.0.0.1" bfdd_options=" --daemon -A 127.0.0.1" -watchfrr_enable=yes +watchfrr_enable=no watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB) valgrind_enable=no |