From 3206c774c70dc87aaf7301b111f82df8d897bb12 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:07:01 +0100 Subject: ndisc6: add ICMPv6 Neighbor Discovery tool --- data/live-build-config/package-lists/vyos-utils.list.chroot | 1 + 1 file changed, 1 insertion(+) 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 4dcfef1e..66e42204 100644 --- a/data/live-build-config/package-lists/vyos-utils.list.chroot +++ b/data/live-build-config/package-lists/vyos-utils.list.chroot @@ -28,3 +28,4 @@ bgpq3 libnss-myhostname ssl-cert nginx-light +ndisc6 -- cgit v1.2.3 From 0a1ecf4928022c076c2b1275cc1369e528590da0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:30:25 +0100 Subject: systemd: pcscd: disable SmartCard service PCSC is included via a dependency of wpa_supplicant. vyos@vyos:~$ apt-cache rdepends pcscd pcscd Reverse Depends: libpcsclite1 opensc libpcsclite1 vyos@vyos:~$ apt-cache rdepends libpcsclite1 libpcsclite1 Reverse Depends: pcscd wpasupplicant --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) 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 0caed88a..74d94a65 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 @@ -39,5 +39,6 @@ systemctl disable strongswan.service systemctl disable frr.service systemctl disable salt-minion.service systemctl disable nginx.service +systemctl disable pcscd.service systemctl enable vyos-hostsd.service -- cgit v1.2.3 From 14d6de44d12b70bba43653d10d17906772f9372e Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Thu, 7 Nov 2019 13:42:05 +0100 Subject: prevent 70-persistent-net.rules from being created --- Makefile | 4 +++- tools/vep4600/90-vep4600.chroot | 2 ++ tools/vep4600/vep4600 | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 tools/vep4600/vep4600 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/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..4d9c5748 --- /dev/null +++ b/tools/vep4600/vep4600 @@ -0,0 +1,17 @@ +#!/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/ -- cgit v1.2.3 From 423c7940a170a391a4cfe5d2feeb4030d631eecf Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Fri, 8 Nov 2019 23:31:56 +0100 Subject: update files for the vep4600 --- tools/vep4600/10-eth0.link | 1 + tools/vep4600/10-eth1.link | 3 ++- tools/vep4600/10-eth2.link | 3 ++- tools/vep4600/10-eth3.link | 3 ++- tools/vep4600/10-eth4.link | 3 ++- tools/vep4600/10-eth5.link | 3 ++- tools/vep4600/10-eth6.link | 3 ++- tools/vep4600/10-unused0.link | 6 ++++++ tools/vep4600/10-unused1.link | 6 ++++++ tools/vep4600/vep4600 | 11 +++++++++++ 10 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 tools/vep4600/10-unused0.link create mode 100644 tools/vep4600/10-unused1.link 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/vep4600 b/tools/vep4600/vep4600 index 4d9c5748..7dcaf034 100755 --- a/tools/vep4600/vep4600 +++ b/tools/vep4600/vep4600 @@ -15,3 +15,14 @@ esac 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/ -- cgit v1.2.3 From 21841422ba13371a65a4ef9bf19d56c7da6f8a3d Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Tue, 3 Dec 2019 15:43:07 +0100 Subject: update vmware api settings --- scripts/template.ovf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 @@ NTP servers for this VM (comma separated). Leave blank if DHCP is desired. + Appliance API Settings - - API configuration key. Leave blank to not enable the API. + + API key to access the VyOS api. If left blank the api wil not be enabled. + + + + API port to listen on for calls. Leave blank to keep it default '443'. + + + + Enable API debug logging -- cgit v1.2.3 From 7b47b452ce86a9479b38d169f288c5eb585d5f2c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 6 Dec 2019 18:37:28 +0100 Subject: Kernel: T1859: update to Linux 4.19.88 --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index 8ae218ee..1180a25f 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "jessie", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "4.19.84", + "kernel_version": "4.19.88", "kernel_flavor": "amd64-vyos", "additional_repositories": [ "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main", -- cgit v1.2.3