Merge branch 'current' of github.com:vyos/vyos-build into equuleus

* 'current' of github.com:vyos/vyos-build:
  Kernel: T1859: update to Linux 4.19.88
  update vmware api settings
  update files for the vep4600
  prevent 70-persistent-net.rules from being created
  systemd: pcscd: disable SmartCard service
  ndisc6: add ICMPv6 Neighbor Discovery tool

14 files changed, 70 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 7b319251..89032002 100644
--- a/Makefile
+++ b/Makefile
@@ -196,8 +196,10 @@ vep4600: check_build_config clean prepare
 	@set -e
 	@echo "It's not like I'm building this specially for you or anything!"
 	mkdir -p build/config/includes.chroot/etc/systemd/network
+	mkdir -p build/config/includes.chroot/usr/share/initramfs-tools/hooks
 	cp tools/vep4600/90-vep4600.chroot build/config/hooks/live/
-	cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network
+	cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network/
+	cp tools/vep4600/vep4600 build/config/includes.chroot/usr/share/initramfs-tools/hooks/
 	cd $(build_dir)
 	lb build 2>&1 | tee build.log
 	cd ..
diff --git a/data/defaults.json b/data/defaults.json
index ff02384c..44d1f089 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
   "debian_distribution": "buster",
   "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
   "vyos_branch": "equuleus",
-  "kernel_version": "4.19.84",
+  "kernel_version": "4.19.88",
   "kernel_flavor": "amd64-vyos",
   "additional_repositories": [],
   "custom_packages": []
diff --git a/scripts/template.ovf b/scripts/template.ovf
index b0952c8c..da81a364 100644
--- a/scripts/template.ovf
+++ b/scripts/template.ovf
@@ -78,9 +78,18 @@
         <Label>Domain Time Servers</Label>
         <Description>NTP servers for this VM (comma separated). Leave blank if DHCP is desired.</Description>
       </Property>
+      <Category>Appliance API Settings</Category>
       <Property ovf:key="APIKEY" ovf:type="string" ovf:userConfigurable="true">
-        <Label>HTTP API configuration key</Label>
-        <Description>API configuration key. Leave blank to not enable the API.</Description>
+        <Label>API key</Label>
+        <Description>API key to access the VyOS api. If left blank the api wil not be enabled.</Description>
+      </Property>
+      <Property ovf:key="APIPORT" ovf:value="443" ovf:type="int" ovf:userConfigurable="true">
+        <Label>API listening port</Label>
+        <Description>API port to listen on for calls. Leave blank to keep it default '443'.</Description>
+      </Property>
+      <Property ovf:key="APIDEBUG" ovf:value="false" ovf:type="boolean" ovf:userConfigurable="true">
+        <Label>API debug logging</Label>
+        <Description>Enable API debug logging</Description>
       </Property>
     </ProductSection>
     <ProductSection ovf:class="vm" ovf:required="false">
diff --git a/tools/vep4600/10-eth0.link b/tools/vep4600/10-eth0.link
index 0885fd8b..c96ee504 100644
--- a/tools/vep4600/10-eth0.link
+++ b/tools/vep4600/10-eth0.link
@@ -1,5 +1,6 @@
 [Match]
 Path=pci-0000:04:*
+Driver=igb
 
 [Link]
 Name=eth0
diff --git a/tools/vep4600/10-eth1.link b/tools/vep4600/10-eth1.link
index 9d33db13..1099a60f 100644
--- a/tools/vep4600/10-eth1.link
+++ b/tools/vep4600/10-eth1.link
@@ -1,5 +1,6 @@
 [Match]
-Path=0000:b8:00.0
+Path=pci-0000:b8:00.0*
+Driver=i40e
 
 [Link]
 Name=eth1
diff --git a/tools/vep4600/10-eth2.link b/tools/vep4600/10-eth2.link
index 60b88f83..4787e28a 100644
--- a/tools/vep4600/10-eth2.link
+++ b/tools/vep4600/10-eth2.link
@@ -1,5 +1,6 @@
 [Match]
-Path=0000:b8:00.1
+Path=pci-0000:b8:00.1*
+Driver=i40e
 
 [Link]
 Name=eth2
diff --git a/tools/vep4600/10-eth3.link b/tools/vep4600/10-eth3.link
index 0c37c8d4..6eb6b2c7 100644
--- a/tools/vep4600/10-eth3.link
+++ b/tools/vep4600/10-eth3.link
@@ -1,5 +1,6 @@
 [Match]
-Path=pci-0000:02:00.1
+Path=pci-0000:02:00.1*
+Driver=igb
 
 [Link]
 Name=eth3
diff --git a/tools/vep4600/10-eth4.link b/tools/vep4600/10-eth4.link
index 7762187a..2590a99b 100644
--- a/tools/vep4600/10-eth4.link
+++ b/tools/vep4600/10-eth4.link
@@ -1,5 +1,6 @@
 [Match]
-Path=pci-0000:02:00.0
+Path=pci-0000:02:00.0*
+Driver=igb
 
 [Link]
 Name=eth4
diff --git a/tools/vep4600/10-eth5.link b/tools/vep4600/10-eth5.link
index 10099488..0147a201 100644
--- a/tools/vep4600/10-eth5.link
+++ b/tools/vep4600/10-eth5.link
@@ -1,5 +1,6 @@
 [Match]
-Path=pci-0000:02:00.3
+Path=pci-0000:02:00.3*
+Driver=igb
 
 [Link]
 Name=eth5
diff --git a/tools/vep4600/10-eth6.link b/tools/vep4600/10-eth6.link
index f3a6fe00..ffcd101d 100644
--- a/tools/vep4600/10-eth6.link
+++ b/tools/vep4600/10-eth6.link
@@ -1,5 +1,6 @@
 [Match]
-Path=pci-0000:02:00.2
+Path=pci-0000:02:00.2*
+Driver=igb
 
 [Link]
 Name=eth6
diff --git a/tools/vep4600/10-unused0.link b/tools/vep4600/10-unused0.link
new file mode 100644
index 00000000..03251a1a
--- /dev/null
+++ b/tools/vep4600/10-unused0.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b8:00.2*
+Driver=i40e
+
+[Link]
+Name=unused0
diff --git a/tools/vep4600/10-unused1.link b/tools/vep4600/10-unused1.link
new file mode 100644
index 00000000..737133f4
--- /dev/null
+++ b/tools/vep4600/10-unused1.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b8:00.3*
+Driver=i40e
+
+[Link]
+Name=unused1
diff --git a/tools/vep4600/90-vep4600.chroot b/tools/vep4600/90-vep4600.chroot
index c4bb7496..a88a7de1 100755
--- a/tools/vep4600/90-vep4600.chroot
+++ b/tools/vep4600/90-vep4600.chroot
@@ -9,6 +9,8 @@ rm /lib/systemd/network/99-default.link
 touch /lib/systemd/network/99-default.link
 rm /lib/udev/rules.d/65-vyatta-net.rules
 touch /lib/udev/rules.d/65-vyatta-net.rules
+rm /lib/udev/rules.d/75-persistent-net-generator.rules
+touch /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo I: Update initramfs.
 update-initramfs -u
diff --git a/tools/vep4600/vep4600 b/tools/vep4600/vep4600
new file mode 100755
index 00000000..7dcaf034
--- /dev/null
+++ b/tools/vep4600/vep4600
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+PREREQS=""
+
+prereqs() { echo "$PREREQS"; }
+
+case "$1" in
+    prereqs)
+    prereqs
+    exit 0
+    ;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+mkdir -p $DESTDIR/etc/systemd/network
+cp -p /etc/systemd/network/*.link $DESTDIR/etc/systemd/network/
+
+mkdir -p $DESTDIR/lib/udev/rules.d
+cp -p /lib/udev/rules.d/50-firmware.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/50-udev-default.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/55-dm.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/60-cdrom_id.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/60-persistent-storage-dm.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/60-persistent-storage.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/75-net-description.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/80-drivers.rules $DESTDIR/lib/udev/rules.d/
+cp -p /lib/udev/rules.d/80-net-setup-link.rules $DESTDIR/lib/udev/rules.d/