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

7 files changed, 12 insertions, 12 deletions

diff --git a/data/defaults.json b/data/defaults.json
index cd110951..5e6515d9 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
   "debian_distribution": "buster",
   "vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
   "vyos_branch": "current",
-  "kernel_version": "4.19.40",
+  "kernel_version": "4.19.54",
   "kernel_flavor": "amd64-vyos",
   "additional_repositories": [],
   "custom_packages": []
diff --git a/data/kernel_version b/data/kernel_version
deleted file mode 100644
index 51333a00..00000000
--- a/data/kernel_version
+++ /dev/null
@@ -1 +0,0 @@
-4.19.40-amd64-vyos
diff --git a/data/live-build-config/hooks/live/17-gen_initramfs.chroot b/data/live-build-config/hooks/live/17-gen_initramfs.chroot
index 6ecf4be7..87b53bd6 100755
--- a/data/live-build-config/hooks/live/17-gen_initramfs.chroot
+++ b/data/live-build-config/hooks/live/17-gen_initramfs.chroot
@@ -5,4 +5,8 @@ echo I: Create initramfs if it does not exist.
 # Kernel complains about non available nls_ascii module when booting from USB pendrive
 echo "nls_ascii" >> /etc/initramfs-tools/modules
 
-update-initramfs -c -u -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'`
+if [ -e /boot/initrd.img-* ]; then
+	rm -f /boot/initrd.img-*
+fi
+
+update-initramfs -c -k `ls /boot | grep vmlinuz- | sed 's/vmlinuz-//g'`
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index d4d89ba8..787510e0 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -38,3 +38,4 @@ systemctl disable tftpd-hpa.service
 systemctl disable strongswan.service
 systemctl disable frr.service
 systemctl disable salt-minion.service
+systemctl disable nginx.service
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()
diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot
index 8c0a8cd4..ee2073fb 100644
--- a/data/live-build-config/package-lists/vyos-utils.list.chroot
+++ b/data/live-build-config/package-lists/vyos-utils.list.chroot
@@ -24,3 +24,6 @@ iotop
 aptitude
 localepurge
 bgpq3
+libnss-myhostname
+ssl-cert
+nginx-light
diff --git a/data/package-lists/vyos-dev.list.chroot b/data/package-lists/vyos-dev.list.chroot
index f3305f30..dd1de5f3 100644
--- a/data/package-lists/vyos-dev.list.chroot
+++ b/data/package-lists/vyos-dev.list.chroot
@@ -1,3 +1,4 @@
 gdb
 strace
 apt-rdepends
+vyos-smoketest