T3294: Change console baud rate for Dell VEP devices. Reorganize directory tree for vendors

40 files changed, 25 insertions, 282 deletions

diff --git a/Makefile b/Makefile
index abcef85b..54a536a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 build_dir := build
+init_msg  := "It's not like I'm building this specially for you or anything!"
 
 .PHONY: all
 all:
@@ -28,7 +29,7 @@ prepare:
 .ONESHELL:
 iso: check_build_config clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	cd $(build_dir)
 	lb build 2>&1 | tee build.log
 	cd ..
@@ -59,7 +60,7 @@ vagrant-libvirt:
 .ONESHELL:
 vmware: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/vmware/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
 	cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/
@@ -78,7 +79,7 @@ hyperv:
 .ONESHELL:
 clearfog: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	cd $(build_dir)
 	@../scripts/build-clearfog-image
 
@@ -86,7 +87,7 @@ clearfog: clean prepare
 .ONESHELL:
 azure: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	cp tools/cloud-init/azure/99-walinuxagent.chroot build/config/hooks/live/
 	cp tools/cloud-init/azure/vyos-azure.list.chroot build/config/package-lists/
 	cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/
@@ -98,7 +99,7 @@ azure: clean prepare
 .ONESHELL:
 GCE: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/GCE/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
 	cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/
@@ -110,7 +111,7 @@ GCE: clean prepare
 .ONESHELL:
 qcow2: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	cd $(build_dir)
 	@../scripts/build-qcow2-image
 
@@ -118,7 +119,7 @@ qcow2: clean prepare
 .ONESHELL:
 GCE-debug: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/99-debug-user.chroot build/config/hooks/live/
 	cp tools/cloud-init/GCE/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
@@ -131,7 +132,7 @@ GCE-debug: clean prepare
 .ONESHELL:
 AWS: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/AWS/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
 	cp tools/cloud-init/AWS/cloud-init.list.chroot build/config/package-lists/
@@ -145,7 +146,7 @@ AWS: clean prepare
 .ONESHELL:
 openstack: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/openstack/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
 	cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/
@@ -159,7 +160,7 @@ openstack: clean prepare
 .ONESHELL:
 oracle: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/OCI/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
 	cp tools/cloud-init/cloud-init.list.chroot build/config/package-lists/
@@ -171,7 +172,7 @@ oracle: clean prepare
 .ONESHELL:
 PACKET: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/99-disable-networking.chroot build/config/hooks/live/
 	cp tools/cloud-init/PACKET/90_dpkg.cfg build/config/includes.chroot/etc/cloud/cloud.cfg.d/
@@ -186,7 +187,7 @@ PACKET: clean prepare
 .ONESHELL:
 PACKET-debug: clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/etc/cloud/cloud.cfg.d
 	cp tools/cloud-init/99-debug-user.chroot build/config/hooks/live/
 	cp tools/cloud-init/99-disable-networking.chroot build/config/hooks/live/
@@ -198,44 +199,14 @@ PACKET-debug: clean prepare
 	cd ..
 	@scripts/copy-image
 
-.PHONY: vep4600
-.ONESHELL:
-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/dell/90-vep.chroot build/config/hooks/live/
-	cp tools/dell/vep4600/*.link build/config/includes.chroot/etc/systemd/network/
-	cp tools/dell/vep-hook build/config/includes.chroot/usr/share/initramfs-tools/hooks/
-	cd $(build_dir)
-	lb build 2>&1 | tee build.log
-	cd ..
-	@scripts/copy-image
-
-.PHONY: vep1400
-.ONESHELL:
-vep1400: 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/dell/90-vep.chroot build/config/hooks/live/
-	cp tools/dell/vep1400/*.link build/config/includes.chroot/etc/systemd/network/
-	cp tools/dell/vep-hook build/config/includes.chroot/usr/share/initramfs-tools/hooks/
-	cd $(build_dir)
-	lb build 2>&1 | tee build.log
-	cd ..
-	@scripts/copy-image
-
 .PHONY: edgecore
 .ONESHELL:
 edgecore: check_build_config clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/lib/udev/rules.d/
-	cp tools/vendors_udev/64-vyos-SAF51015I-net.rules build/config/includes.chroot/lib/udev/rules.d/
-	cp tools/vendors_udev/64-vyos-SAF51003I-net.rules build/config/includes.chroot/lib/udev/rules.d/
+	cp tools/vendors/edgecore/64-vyos-SAF51015I-net.rules build/config/includes.chroot/lib/udev/rules.d/
+	cp tools/vendors/edgecore/64-vyos-SAF51003I-net.rules build/config/includes.chroot/lib/udev/rules.d/
 	cd $(build_dir)
 	lb build 2>&1 | tee build.log
 	cd ..
@@ -245,10 +216,11 @@ edgecore: check_build_config clean prepare
 .ONESHELL:
 dell: check_build_config clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/lib/udev/rules.d/
-	cp tools/vendors_udev/64-vyos-VEP4600-net.rules build/config/includes.chroot/lib/udev/rules.d/
-	cp tools/vendors_udev/64-vyos-VEP1400-net.rules build/config/includes.chroot/lib/udev/rules.d/
+	cp tools/vendors/dell/64-vyos-VEP4600-net.rules build/config/includes.chroot/lib/udev/rules.d/
+	cp tools/vendors/dell/64-vyos-VEP1400-net.rules build/config/includes.chroot/lib/udev/rules.d/
+	cp tools/vendors/dell/90-VEP-COMMON.chroot build/config/hooks/live/
 	cd $(build_dir)
 	lb build 2>&1 | tee build.log
 	cd ..
@@ -258,9 +230,9 @@ dell: check_build_config clean prepare
 .ONESHELL:
 lanner_nca25xx: check_build_config clean prepare
 	@set -e
-	@echo "It's not like I'm building this specially for you or anything!"
+	@echo $(init_msg)
 	mkdir -p build/config/includes.chroot/lib/udev/rules.d/
-	cp tools/vendors_udev/64-vyos-lanner-NCA-25XX-net.rules build/config/includes.chroot/lib/udev/rules.d/
+	cp tools/vendors/lanner/64-vyos-lanner-NCA-25XX-net.rules build/config/includes.chroot/lib/udev/rules.d/
 	cd $(build_dir)
 	lb build 2>&1 | tee build.log
 	cd ..
diff --git a/tools/dell/90-vep.chroot b/tools/dell/90-vep.chroot
deleted file mode 100755
index a88a7de1..00000000
--- a/tools/dell/90-vep.chroot
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-echo I: Change the default serial baud rate.
-sed -i 's/9600/115200/g' /opt/vyatta/etc/config-migrate/migrate/system/3-to-4
-
-echo "ShowStatus=yes" >> /etc/systemd/system.conf
-
-echo I: Disable default link rule.
-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/dell/vep-hook b/tools/dell/vep-hook
deleted file mode 100755
index 7dcaf034..00000000
--- a/tools/dell/vep-hook
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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/
diff --git a/tools/dell/vep1400/10-eth0-000.link b/tools/dell/vep1400/10-eth0-000.link
deleted file mode 100644
index db36f5ce..00000000
--- a/tools/dell/vep1400/10-eth0-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:05:00.1
-Driver=ixgbe
-
-[Link]
-Name=eth0
-Alias=SFP+1
diff --git a/tools/dell/vep1400/10-eth1-000.link b/tools/dell/vep1400/10-eth1-000.link
deleted file mode 100644
index 7bf1a175..00000000
--- a/tools/dell/vep1400/10-eth1-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:05:00.0
-Driver=ixgbe
-
-[Link]
-Name=eth1
-Alias=SFP+2
diff --git a/tools/dell/vep1400/10-eth2-000.link b/tools/dell/vep1400/10-eth2-000.link
deleted file mode 100644
index 81f3f5bc..00000000
--- a/tools/dell/vep1400/10-eth2-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:02:00.2
-Driver=igb
-
-[Link]
-Name=eth2
-Alias=GE1
diff --git a/tools/dell/vep1400/10-eth3-000.link b/tools/dell/vep1400/10-eth3-000.link
deleted file mode 100644
index fe37dfac..00000000
--- a/tools/dell/vep1400/10-eth3-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:02:00.3
-Driver=igb
-
-[Link]
-Name=eth3
-Alias=GE2
diff --git a/tools/dell/vep1400/10-eth4-000.link b/tools/dell/vep1400/10-eth4-000.link
deleted file mode 100644
index a76ecd24..00000000
--- a/tools/dell/vep1400/10-eth4-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:02:00.0
-Driver=igb
-
-[Link]
-Name=eth4
-Alias=GE3
diff --git a/tools/dell/vep1400/10-eth5-000.link b/tools/dell/vep1400/10-eth5-000.link
deleted file mode 100644
index 0e848dde..00000000
--- a/tools/dell/vep1400/10-eth5-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:02:00.1
-Driver=igb
-
-[Link]
-Name=eth5
-Alias=GE4
diff --git a/tools/dell/vep1400/10-eth6-000.link b/tools/dell/vep1400/10-eth6-000.link
deleted file mode 100644
index 10ad451d..00000000
--- a/tools/dell/vep1400/10-eth6-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:07:00.1
-Driver=ixgbe
-
-[Link]
-Name=eth6
-Alias=GE5
diff --git a/tools/dell/vep1400/10-eth7-000.link b/tools/dell/vep1400/10-eth7-000.link
deleted file mode 100644
index 57b94502..00000000
--- a/tools/dell/vep1400/10-eth7-000.link
+++ /dev/null
@@ -1,7 +0,0 @@
-[Match]
-Path=pci-0000:07:00.0
-Driver=ixgbe
-
-[Link]
-Name=eth7
-Alias=GE6
diff --git a/tools/dell/vep4600/10-eth0-000.link b/tools/dell/vep4600/10-eth0-000.link
deleted file mode 100644
index 9b466fe8..00000000
--- a/tools/dell/vep4600/10-eth0-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:04:00.0
-Driver=igb
-
-[Link]
-Name=eth0
diff --git a/tools/dell/vep4600/10-eth0-001.link b/tools/dell/vep4600/10-eth0-001.link
deleted file mode 100644
index c60acc3a..00000000
--- a/tools/dell/vep4600/10-eth0-001.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:05:00.0
-Driver=igb
-
-[Link]
-Name=eth0
diff --git a/tools/dell/vep4600/10-eth1-000.link b/tools/dell/vep4600/10-eth1-000.link
deleted file mode 100644
index c49b7bda..00000000
--- a/tools/dell/vep4600/10-eth1-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b8:00.0
-Driver=i40e
-
-[Link]
-Name=eth1
diff --git a/tools/dell/vep4600/10-eth1-001.link b/tools/dell/vep4600/10-eth1-001.link
deleted file mode 100644
index c32e5e86..00000000
--- a/tools/dell/vep4600/10-eth1-001.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b6:00.0
-Driver=i40e
-
-[Link]
-Name=eth1
diff --git a/tools/dell/vep4600/10-eth10-000.link b/tools/dell/vep4600/10-eth10-000.link
deleted file mode 100644
index 414b2d30..00000000
--- a/tools/dell/vep4600/10-eth10-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:65:00.3
-Driver=i40e
-
-[Link]
-Name=eth10
diff --git a/tools/dell/vep4600/10-eth11-000.link b/tools/dell/vep4600/10-eth11-000.link
deleted file mode 100644
index 0579dcff..00000000
--- a/tools/dell/vep4600/10-eth11-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:17:00.0
-Driver=i40e
-
-[Link]
-Name=eth11
diff --git a/tools/dell/vep4600/10-eth12-000.link b/tools/dell/vep4600/10-eth12-000.link
deleted file mode 100644
index 9f9a3c0c..00000000
--- a/tools/dell/vep4600/10-eth12-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:17:00.1
-Driver=i40e
-
-[Link]
-Name=eth12
diff --git a/tools/dell/vep4600/10-eth13-000.link b/tools/dell/vep4600/10-eth13-000.link
deleted file mode 100644
index 8b8c2254..00000000
--- a/tools/dell/vep4600/10-eth13-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:17:00.2
-Driver=i40e
-
-[Link]
-Name=eth13
diff --git a/tools/dell/vep4600/10-eth14-000.link b/tools/dell/vep4600/10-eth14-000.link
deleted file mode 100644
index a746ada9..00000000
--- a/tools/dell/vep4600/10-eth14-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:17:00.3
-Driver=i40e
-
-[Link]
-Name=eth14
diff --git a/tools/dell/vep4600/10-eth2-000.link b/tools/dell/vep4600/10-eth2-000.link
deleted file mode 100644
index 7c100cee..00000000
--- a/tools/dell/vep4600/10-eth2-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b8:00.1
-Driver=i40e
-
-[Link]
-Name=eth2
diff --git a/tools/dell/vep4600/10-eth2-001.link b/tools/dell/vep4600/10-eth2-001.link
deleted file mode 100644
index 4ff72387..00000000
--- a/tools/dell/vep4600/10-eth2-001.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b6:00.1
-Driver=i40e
-
-[Link]
-Name=eth2
diff --git a/tools/dell/vep4600/10-eth3-000.link b/tools/dell/vep4600/10-eth3-000.link
deleted file mode 100644
index 824670ec..00000000
--- a/tools/dell/vep4600/10-eth3-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:02:00.1
-Driver=igb
-
-[Link]
-Name=eth3
diff --git a/tools/dell/vep4600/10-eth4-000.link b/tools/dell/vep4600/10-eth4-000.link
deleted file mode 100644
index ed3a80a2..00000000
--- a/tools/dell/vep4600/10-eth4-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:02:00.0
-Driver=igb
-
-[Link]
-Name=eth4
diff --git a/tools/dell/vep4600/10-eth5-000.link b/tools/dell/vep4600/10-eth5-000.link
deleted file mode 100644
index 5d21982d..00000000
--- a/tools/dell/vep4600/10-eth5-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:02:00.3
-Driver=igb
-
-[Link]
-Name=eth5
diff --git a/tools/dell/vep4600/10-eth6-000.link b/tools/dell/vep4600/10-eth6-000.link
deleted file mode 100644
index a00a0c43..00000000
--- a/tools/dell/vep4600/10-eth6-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:02:00.2
-Driver=igb
-
-[Link]
-Name=eth6
diff --git a/tools/dell/vep4600/10-eth7-000.link b/tools/dell/vep4600/10-eth7-000.link
deleted file mode 100644
index 3db698ae..00000000
--- a/tools/dell/vep4600/10-eth7-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:65:00.0
-Driver=i40e
-
-[Link]
-Name=eth7
diff --git a/tools/dell/vep4600/10-eth8-000.link b/tools/dell/vep4600/10-eth8-000.link
deleted file mode 100644
index 9858190a..00000000
--- a/tools/dell/vep4600/10-eth8-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:65:00.1
-Driver=i40e
-
-[Link]
-Name=eth8
diff --git a/tools/dell/vep4600/10-eth9-000.link b/tools/dell/vep4600/10-eth9-000.link
deleted file mode 100644
index 62ba54f2..00000000
--- a/tools/dell/vep4600/10-eth9-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:65:00.2
-Driver=i40e
-
-[Link]
-Name=eth9
diff --git a/tools/dell/vep4600/10-unused0-000.link b/tools/dell/vep4600/10-unused0-000.link
deleted file mode 100644
index 60acba9f..00000000
--- a/tools/dell/vep4600/10-unused0-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b8:00.2
-Driver=i40e
-
-[Link]
-Name=unused0
diff --git a/tools/dell/vep4600/10-unused0-001.link b/tools/dell/vep4600/10-unused0-001.link
deleted file mode 100644
index e9014fb0..00000000
--- a/tools/dell/vep4600/10-unused0-001.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b6:00.2
-Driver=i40e
-
-[Link]
-Name=unused0
diff --git a/tools/dell/vep4600/10-unused1-000.link b/tools/dell/vep4600/10-unused1-000.link
deleted file mode 100644
index 0860d005..00000000
--- a/tools/dell/vep4600/10-unused1-000.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b8:00.3
-Driver=i40e
-
-[Link]
-Name=unused1
diff --git a/tools/dell/vep4600/10-unused1-001.link b/tools/dell/vep4600/10-unused1-001.link
deleted file mode 100644
index de906fcf..00000000
--- a/tools/dell/vep4600/10-unused1-001.link
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Path=pci-0000:b6:00.3
-Driver=i40e
-
-[Link]
-Name=unused1
diff --git a/tools/dell/vep4600/99-default.link b/tools/dell/vep4600/99-default.link
deleted file mode 100644
index e69de29b..00000000
--- a/tools/dell/vep4600/99-default.link
+++ /dev/null
diff --git a/tools/vendors_udev/64-vyos-VEP1400-net.rules b/tools/vendors/dell/64-vyos-VEP1400-net.rules
index 37f623e8..37f623e8 100644
--- a/tools/vendors_udev/64-vyos-VEP1400-net.rules
+++ b/tools/vendors/dell/64-vyos-VEP1400-net.rules
diff --git a/tools/vendors_udev/64-vyos-VEP4600-net.rules b/tools/vendors/dell/64-vyos-VEP4600-net.rules
index 21aa166d..21aa166d 100644
--- a/tools/vendors_udev/64-vyos-VEP4600-net.rules
+++ b/tools/vendors/dell/64-vyos-VEP4600-net.rules
diff --git a/tools/vendors/dell/90-VEP-COMMON.chroot b/tools/vendors/dell/90-VEP-COMMON.chroot
new file mode 100755
index 00000000..ad1cd983
--- /dev/null
+++ b/tools/vendors/dell/90-VEP-COMMON.chroot
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo I: Change the default serial baud rate.
+sed -i 's/9600/115200/g' /opt/vyatta/etc/config-migrate/migrate/system/3-to-4
diff --git a/tools/vendors_udev/64-vyos-SAF51003I-net.rules b/tools/vendors/edgecore/64-vyos-SAF51003I-net.rules
index 0da995d0..0da995d0 100644
--- a/tools/vendors_udev/64-vyos-SAF51003I-net.rules
+++ b/tools/vendors/edgecore/64-vyos-SAF51003I-net.rules
diff --git a/tools/vendors_udev/64-vyos-SAF51015I-net.rules b/tools/vendors/edgecore/64-vyos-SAF51015I-net.rules
index eab23bdb..eab23bdb 100644
--- a/tools/vendors_udev/64-vyos-SAF51015I-net.rules
+++ b/tools/vendors/edgecore/64-vyos-SAF51015I-net.rules
diff --git a/tools/vendors_udev/64-vyos-lanner-NCA-25XX-net.rules b/tools/vendors/lanner/64-vyos-lanner-NCA-25XX-net.rules
index 095a3ea6..095a3ea6 100644
--- a/tools/vendors_udev/64-vyos-lanner-NCA-25XX-net.rules
+++ b/tools/vendors/lanner/64-vyos-lanner-NCA-25XX-net.rules