Merge remote-tracking branch 'origin/current' into equuleus

fixed merge errors in:
    * scripts/live-build-config
      - kernel parameters

    * scripts/build-packages
      - fixed list of packages to compile

1 files changed, 1 insertions, 9 deletions

diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot
index d3cfbce5..3380ef8c 100755
--- a/data/live-build-config/hooks/live/30-frr-configs.chroot
+++ b/data/live-build-config/hooks/live/30-frr-configs.chroot
@@ -26,11 +26,9 @@ eigrpd=no
 babeld=no
 sharpd=no
 pbrd=no
-bfdd=no
+bfdd=yes
 staticd=yes
-"""
 
-daemons_conf = """
 vtysh_enable=yes
 zebra_options="  -s 90000000 --daemon -A 127.0.0.1 -M snmp -n"
 bgpd_options="   --daemon -A 127.0.0.1 -M snmp -M rpki"
@@ -50,18 +48,12 @@ staticd_options="  --daemon -A 127.0.0.1"
 bfdd_options="  --daemon -A 127.0.0.1"
 
 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
-valgrind=/usr/bin/valgrind
 """
 
 with open("/etc/frr/daemons", "w") as f:
     f.write(daemons)
 
-with open("/etc/frr/daemons.conf", "w") as f:
-    f.write(daemons_conf)
-
 # Create empty daemon configs so that they start properly
 for name in ["zebra.conf", "bgpd.conf", "ospfd.conf", "ospf6d.conf", "ripd.conf", "ripngd.conf"]:
     open(os.path.join("/etc/frr", name), 'a').close()