From e3a891b2c4dca19a5175d5d1525040a7be8449fd Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Fri, 15 Nov 2019 10:37:00 +0000 Subject: add build option for Edge-Core saf51015I --- tools/saf51015I/11-eth1.link | 5 +++++ tools/saf51015I/12-eth2.link | 5 +++++ tools/saf51015I/13-eth3.link | 5 +++++ tools/saf51015I/14-eth4.link | 5 +++++ tools/saf51015I/15-eth5.link | 5 +++++ tools/saf51015I/16-eth6.link | 5 +++++ tools/saf51015I/17-eth7.link | 5 +++++ tools/saf51015I/18-eth8.link | 5 +++++ tools/saf51015I/19-eth9.link | 5 +++++ tools/saf51015I/20-eth10.link | 5 +++++ tools/saf51015I/21-eth11.link | 5 +++++ tools/saf51015I/22-eth12.link | 5 +++++ tools/saf51015I/90-saf51015I.chroot | 13 +++++++++++++ tools/saf51015I/99-default.link | 0 tools/saf51015I/saf51015I | 28 ++++++++++++++++++++++++++++ 15 files changed, 101 insertions(+) create mode 100644 tools/saf51015I/11-eth1.link create mode 100644 tools/saf51015I/12-eth2.link create mode 100644 tools/saf51015I/13-eth3.link create mode 100644 tools/saf51015I/14-eth4.link create mode 100644 tools/saf51015I/15-eth5.link create mode 100644 tools/saf51015I/16-eth6.link create mode 100644 tools/saf51015I/17-eth7.link create mode 100644 tools/saf51015I/18-eth8.link create mode 100644 tools/saf51015I/19-eth9.link create mode 100644 tools/saf51015I/20-eth10.link create mode 100644 tools/saf51015I/21-eth11.link create mode 100644 tools/saf51015I/22-eth12.link create mode 100755 tools/saf51015I/90-saf51015I.chroot create mode 100644 tools/saf51015I/99-default.link create mode 100755 tools/saf51015I/saf51015I (limited to 'tools') diff --git a/tools/saf51015I/11-eth1.link b/tools/saf51015I/11-eth1.link new file mode 100644 index 00000000..16392247 --- /dev/null +++ b/tools/saf51015I/11-eth1.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:02:00.0* + +[Link] +Name=eth1 diff --git a/tools/saf51015I/12-eth2.link b/tools/saf51015I/12-eth2.link new file mode 100644 index 00000000..444f6c96 --- /dev/null +++ b/tools/saf51015I/12-eth2.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:03:00.0* + +[Link] +Name=eth2 diff --git a/tools/saf51015I/13-eth3.link b/tools/saf51015I/13-eth3.link new file mode 100644 index 00000000..2a2a41b8 --- /dev/null +++ b/tools/saf51015I/13-eth3.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:04:00.0* + +[Link] +Name=eth3 diff --git a/tools/saf51015I/14-eth4.link b/tools/saf51015I/14-eth4.link new file mode 100644 index 00000000..6a86ae67 --- /dev/null +++ b/tools/saf51015I/14-eth4.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:05:00.0* + +[Link] +Name=eth4 diff --git a/tools/saf51015I/15-eth5.link b/tools/saf51015I/15-eth5.link new file mode 100644 index 00000000..974084de --- /dev/null +++ b/tools/saf51015I/15-eth5.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:06:00.0* + +[Link] +Name=eth5 diff --git a/tools/saf51015I/16-eth6.link b/tools/saf51015I/16-eth6.link new file mode 100644 index 00000000..26169369 --- /dev/null +++ b/tools/saf51015I/16-eth6.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:06:00.1* + +[Link] +Name=eth6 diff --git a/tools/saf51015I/17-eth7.link b/tools/saf51015I/17-eth7.link new file mode 100644 index 00000000..44346fb2 --- /dev/null +++ b/tools/saf51015I/17-eth7.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:06:00.2* + +[Link] +Name=eth7 diff --git a/tools/saf51015I/18-eth8.link b/tools/saf51015I/18-eth8.link new file mode 100644 index 00000000..12e3fa30 --- /dev/null +++ b/tools/saf51015I/18-eth8.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:06:00.3* + +[Link] +Name=eth8 diff --git a/tools/saf51015I/19-eth9.link b/tools/saf51015I/19-eth9.link new file mode 100644 index 00000000..f67a3da9 --- /dev/null +++ b/tools/saf51015I/19-eth9.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:0a:00.0* + +[Link] +Name=eth9 diff --git a/tools/saf51015I/20-eth10.link b/tools/saf51015I/20-eth10.link new file mode 100644 index 00000000..1a6e959f --- /dev/null +++ b/tools/saf51015I/20-eth10.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:0a:00.1* + +[Link] +Name=eth10 diff --git a/tools/saf51015I/21-eth11.link b/tools/saf51015I/21-eth11.link new file mode 100644 index 00000000..e107e983 --- /dev/null +++ b/tools/saf51015I/21-eth11.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:0b:00.0* + +[Link] +Name=eth11 diff --git a/tools/saf51015I/22-eth12.link b/tools/saf51015I/22-eth12.link new file mode 100644 index 00000000..e17caf5f --- /dev/null +++ b/tools/saf51015I/22-eth12.link @@ -0,0 +1,5 @@ +[Match] +Path=pci-0000:0b:00.1* + +[Link] +Name=eth12 diff --git a/tools/saf51015I/90-saf51015I.chroot b/tools/saf51015I/90-saf51015I.chroot new file mode 100755 index 00000000..aa4da964 --- /dev/null +++ b/tools/saf51015I/90-saf51015I.chroot @@ -0,0 +1,13 @@ +#!/bin/sh +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/saf51015I/99-default.link b/tools/saf51015I/99-default.link new file mode 100644 index 00000000..e69de29b diff --git a/tools/saf51015I/saf51015I b/tools/saf51015I/saf51015I new file mode 100755 index 00000000..7dcaf034 --- /dev/null +++ b/tools/saf51015I/saf51015I @@ -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/ -- cgit v1.2.3 From 8d3da190caaba1a94739b1f5cb8f0a35ef4474ed Mon Sep 17 00:00:00 2001 From: Eshenko Dmitriy Date: Sun, 24 Nov 2019 22:50:46 +0300 Subject: Add build option for Edge-Core SAF51003L --- Makefile | 27 ++++++++++++++++++++++++--- tools/saf51003I/11-eth1.link | 6 ++++++ tools/saf51003I/12-eth2.link | 6 ++++++ tools/saf51003I/13-eth3.link | 6 ++++++ tools/saf51003I/14-eth4.link | 6 ++++++ tools/saf51003I/15-eth5.link | 6 ++++++ tools/saf51003I/16-eth6.link | 6 ++++++ tools/saf51003I/17-eth7.link | 6 ++++++ tools/saf51003I/18-eth8.link | 6 ++++++ tools/saf51003I/19-eth9.link | 6 ++++++ tools/saf51003I/20-eth10.link | 6 ++++++ tools/saf51003I/90-saf51003I.chroot | 13 +++++++++++++ tools/saf51003I/99-default.link | 0 tools/saf51003I/saf51003I | 28 ++++++++++++++++++++++++++++ 14 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 tools/saf51003I/11-eth1.link create mode 100644 tools/saf51003I/12-eth2.link create mode 100644 tools/saf51003I/13-eth3.link create mode 100644 tools/saf51003I/14-eth4.link create mode 100644 tools/saf51003I/15-eth5.link create mode 100644 tools/saf51003I/16-eth6.link create mode 100644 tools/saf51003I/17-eth7.link create mode 100644 tools/saf51003I/18-eth8.link create mode 100644 tools/saf51003I/19-eth9.link create mode 100644 tools/saf51003I/20-eth10.link create mode 100755 tools/saf51003I/90-saf51003I.chroot create mode 100644 tools/saf51003I/99-default.link create mode 100755 tools/saf51003I/saf51003I (limited to 'tools') diff --git a/Makefile b/Makefile index aac46e89..6842ee00 100644 --- a/Makefile +++ b/Makefile @@ -238,6 +238,21 @@ saf51015I: check_build_config clean prepare cd .. @scripts/copy-image +.PHONY: saf51003I +.ONESHELL: +saf51003I: 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/saf51003I/90-saf51003I.chroot build/config/hooks/live/ + cp tools/saf51003I/*.link build/config/includes.chroot/etc/systemd/network/ + cp tools/saf51003I/saf51003I build/config/includes.chroot/usr/share/initramfs-tools/hooks/ + cd $(build_dir) + lb build 2>&1 | tee build.log + cd .. + @scripts/copy-image + .PHONY: test .ONESHELL: test: @@ -247,6 +262,15 @@ test: fi scripts/check-qemu-install --debug build/live-image-amd64.hybrid.iso +.PHONY: test +.ONESHELL: +test-no-interfaces: + if [ ! -f build/live-image-amd64.hybrid.iso ]; then + echo "Could not find build/live-image-amd64.hybrid.iso" + exit 1 + fi + scripts/check-qemu-install --debug --no-interfaces build/live-image-amd64.hybrid.iso + .PHONY: testd .ONESHELL: testd: @@ -265,8 +289,6 @@ testc: fi scripts/check-qemu-install --debug --configd --configtest build/live-image-amd64.hybrid.iso -======= ->>>>>>> a46cc51... add build option for Edge-Core saf51015I .PHONY: clean .ONESHELL: clean: @@ -286,7 +308,6 @@ clean: rm -f *.mf rm -f *.ovf rm -f *.ova - rm -f *.vmdk .PHONY: purge purge: diff --git a/tools/saf51003I/11-eth1.link b/tools/saf51003I/11-eth1.link new file mode 100644 index 00000000..6bfc4908 --- /dev/null +++ b/tools/saf51003I/11-eth1.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:02:00.0* + +[Link] +Name=eth1 +Alias=LAN1 diff --git a/tools/saf51003I/12-eth2.link b/tools/saf51003I/12-eth2.link new file mode 100644 index 00000000..5b900781 --- /dev/null +++ b/tools/saf51003I/12-eth2.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:02:00.1* + +[Link] +Name=eth2 +Alias=LAN2 diff --git a/tools/saf51003I/13-eth3.link b/tools/saf51003I/13-eth3.link new file mode 100644 index 00000000..24f10e35 --- /dev/null +++ b/tools/saf51003I/13-eth3.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:02:00.2* + +[Link] +Name=eth3 +Alias=LAN3 diff --git a/tools/saf51003I/14-eth4.link b/tools/saf51003I/14-eth4.link new file mode 100644 index 00000000..f2df4d44 --- /dev/null +++ b/tools/saf51003I/14-eth4.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:02:00.3* + +[Link] +Name=eth4 +Alias=LAN4 diff --git a/tools/saf51003I/15-eth5.link b/tools/saf51003I/15-eth5.link new file mode 100644 index 00000000..40bbe5c8 --- /dev/null +++ b/tools/saf51003I/15-eth5.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:05:00.0* + +[Link] +Name=eth5 +Alias=LAN5 diff --git a/tools/saf51003I/16-eth6.link b/tools/saf51003I/16-eth6.link new file mode 100644 index 00000000..c9aa0ca5 --- /dev/null +++ b/tools/saf51003I/16-eth6.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:05:00.1* + +[Link] +Name=eth6 +Alias=LAN6 diff --git a/tools/saf51003I/17-eth7.link b/tools/saf51003I/17-eth7.link new file mode 100644 index 00000000..897f1c2e --- /dev/null +++ b/tools/saf51003I/17-eth7.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:05:00.2* + +[Link] +Name=eth7 +Alias=LAN7 diff --git a/tools/saf51003I/18-eth8.link b/tools/saf51003I/18-eth8.link new file mode 100644 index 00000000..b28cccec --- /dev/null +++ b/tools/saf51003I/18-eth8.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:05:00.3* + +[Link] +Name=eth8 +Alias=LAN8 diff --git a/tools/saf51003I/19-eth9.link b/tools/saf51003I/19-eth9.link new file mode 100644 index 00000000..60dd0fff --- /dev/null +++ b/tools/saf51003I/19-eth9.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:08:00.0* + +[Link] +Name=eth9 +Alias=DMZ diff --git a/tools/saf51003I/20-eth10.link b/tools/saf51003I/20-eth10.link new file mode 100644 index 00000000..7d6ac36d --- /dev/null +++ b/tools/saf51003I/20-eth10.link @@ -0,0 +1,6 @@ +[Match] +Path=pci-0000:08:00.1* + +[Link] +Name=eth10 +Alias=WAN diff --git a/tools/saf51003I/90-saf51003I.chroot b/tools/saf51003I/90-saf51003I.chroot new file mode 100755 index 00000000..aa4da964 --- /dev/null +++ b/tools/saf51003I/90-saf51003I.chroot @@ -0,0 +1,13 @@ +#!/bin/sh +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/saf51003I/99-default.link b/tools/saf51003I/99-default.link new file mode 100644 index 00000000..e69de29b diff --git a/tools/saf51003I/saf51003I b/tools/saf51003I/saf51003I new file mode 100755 index 00000000..7dcaf034 --- /dev/null +++ b/tools/saf51003I/saf51003I @@ -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/ -- cgit v1.2.3 From ccd513928c423d284ac91a7ca701817c080fc303 Mon Sep 17 00:00:00 2001 From: DmitriyEshenko Date: Tue, 31 Dec 2019 13:18:31 +0000 Subject: Improve interface naming for EC saf51015I/saf51003I --- Makefile | 14 ++++--------- tools/saf51003I/11-eth1.link | 6 ------ tools/saf51003I/12-eth2.link | 6 ------ tools/saf51003I/13-eth3.link | 6 ------ tools/saf51003I/14-eth4.link | 6 ------ tools/saf51003I/15-eth5.link | 6 ------ tools/saf51003I/16-eth6.link | 6 ------ tools/saf51003I/17-eth7.link | 6 ------ tools/saf51003I/18-eth8.link | 6 ------ tools/saf51003I/19-eth9.link | 6 ------ tools/saf51003I/20-eth10.link | 6 ------ tools/saf51003I/90-saf51003I.chroot | 13 ------------ tools/saf51003I/99-default.link | 0 tools/saf51003I/saf51003I | 28 -------------------------- tools/saf51015I/11-eth1.link | 5 ----- tools/saf51015I/12-eth2.link | 5 ----- tools/saf51015I/13-eth3.link | 5 ----- tools/saf51015I/14-eth4.link | 5 ----- tools/saf51015I/15-eth5.link | 5 ----- tools/saf51015I/16-eth6.link | 5 ----- tools/saf51015I/17-eth7.link | 5 ----- tools/saf51015I/18-eth8.link | 5 ----- tools/saf51015I/19-eth9.link | 5 ----- tools/saf51015I/20-eth10.link | 5 ----- tools/saf51015I/21-eth11.link | 5 ----- tools/saf51015I/22-eth12.link | 5 ----- tools/saf51015I/90-saf51015I.chroot | 13 ------------ tools/saf51015I/99-default.link | 0 tools/saf51015I/saf51015I | 28 -------------------------- tools/vendors_udev/64-vyos-SAF51003I-net.rules | 14 +++++++++++++ tools/vendors_udev/64-vyos-SAF51015I-net.rules | 16 +++++++++++++++ 31 files changed, 34 insertions(+), 212 deletions(-) delete mode 100644 tools/saf51003I/11-eth1.link delete mode 100644 tools/saf51003I/12-eth2.link delete mode 100644 tools/saf51003I/13-eth3.link delete mode 100644 tools/saf51003I/14-eth4.link delete mode 100644 tools/saf51003I/15-eth5.link delete mode 100644 tools/saf51003I/16-eth6.link delete mode 100644 tools/saf51003I/17-eth7.link delete mode 100644 tools/saf51003I/18-eth8.link delete mode 100644 tools/saf51003I/19-eth9.link delete mode 100644 tools/saf51003I/20-eth10.link delete mode 100755 tools/saf51003I/90-saf51003I.chroot delete mode 100644 tools/saf51003I/99-default.link delete mode 100755 tools/saf51003I/saf51003I delete mode 100644 tools/saf51015I/11-eth1.link delete mode 100644 tools/saf51015I/12-eth2.link delete mode 100644 tools/saf51015I/13-eth3.link delete mode 100644 tools/saf51015I/14-eth4.link delete mode 100644 tools/saf51015I/15-eth5.link delete mode 100644 tools/saf51015I/16-eth6.link delete mode 100644 tools/saf51015I/17-eth7.link delete mode 100644 tools/saf51015I/18-eth8.link delete mode 100644 tools/saf51015I/19-eth9.link delete mode 100644 tools/saf51015I/20-eth10.link delete mode 100644 tools/saf51015I/21-eth11.link delete mode 100644 tools/saf51015I/22-eth12.link delete mode 100755 tools/saf51015I/90-saf51015I.chroot delete mode 100644 tools/saf51015I/99-default.link delete mode 100755 tools/saf51015I/saf51015I create mode 100644 tools/vendors_udev/64-vyos-SAF51003I-net.rules create mode 100644 tools/vendors_udev/64-vyos-SAF51015I-net.rules (limited to 'tools') diff --git a/Makefile b/Makefile index 6842ee00..15036556 100644 --- a/Makefile +++ b/Makefile @@ -228,11 +228,8 @@ vep1400: check_build_config clean prepare saf51015I: 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/saf51015I/90-saf51015I.chroot build/config/hooks/live/ - cp tools/saf51015I/*.link build/config/includes.chroot/etc/systemd/network/ - cp tools/saf51015I/saf51015I build/config/includes.chroot/usr/share/initramfs-tools/hooks/ + 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/ cd $(build_dir) lb build 2>&1 | tee build.log cd .. @@ -243,11 +240,8 @@ saf51015I: check_build_config clean prepare saf51003I: 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/saf51003I/90-saf51003I.chroot build/config/hooks/live/ - cp tools/saf51003I/*.link build/config/includes.chroot/etc/systemd/network/ - cp tools/saf51003I/saf51003I build/config/includes.chroot/usr/share/initramfs-tools/hooks/ + mkdir -p 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/ cd $(build_dir) lb build 2>&1 | tee build.log cd .. diff --git a/tools/saf51003I/11-eth1.link b/tools/saf51003I/11-eth1.link deleted file mode 100644 index 6bfc4908..00000000 --- a/tools/saf51003I/11-eth1.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:02:00.0* - -[Link] -Name=eth1 -Alias=LAN1 diff --git a/tools/saf51003I/12-eth2.link b/tools/saf51003I/12-eth2.link deleted file mode 100644 index 5b900781..00000000 --- a/tools/saf51003I/12-eth2.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:02:00.1* - -[Link] -Name=eth2 -Alias=LAN2 diff --git a/tools/saf51003I/13-eth3.link b/tools/saf51003I/13-eth3.link deleted file mode 100644 index 24f10e35..00000000 --- a/tools/saf51003I/13-eth3.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:02:00.2* - -[Link] -Name=eth3 -Alias=LAN3 diff --git a/tools/saf51003I/14-eth4.link b/tools/saf51003I/14-eth4.link deleted file mode 100644 index f2df4d44..00000000 --- a/tools/saf51003I/14-eth4.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:02:00.3* - -[Link] -Name=eth4 -Alias=LAN4 diff --git a/tools/saf51003I/15-eth5.link b/tools/saf51003I/15-eth5.link deleted file mode 100644 index 40bbe5c8..00000000 --- a/tools/saf51003I/15-eth5.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:05:00.0* - -[Link] -Name=eth5 -Alias=LAN5 diff --git a/tools/saf51003I/16-eth6.link b/tools/saf51003I/16-eth6.link deleted file mode 100644 index c9aa0ca5..00000000 --- a/tools/saf51003I/16-eth6.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:05:00.1* - -[Link] -Name=eth6 -Alias=LAN6 diff --git a/tools/saf51003I/17-eth7.link b/tools/saf51003I/17-eth7.link deleted file mode 100644 index 897f1c2e..00000000 --- a/tools/saf51003I/17-eth7.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:05:00.2* - -[Link] -Name=eth7 -Alias=LAN7 diff --git a/tools/saf51003I/18-eth8.link b/tools/saf51003I/18-eth8.link deleted file mode 100644 index b28cccec..00000000 --- a/tools/saf51003I/18-eth8.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:05:00.3* - -[Link] -Name=eth8 -Alias=LAN8 diff --git a/tools/saf51003I/19-eth9.link b/tools/saf51003I/19-eth9.link deleted file mode 100644 index 60dd0fff..00000000 --- a/tools/saf51003I/19-eth9.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:08:00.0* - -[Link] -Name=eth9 -Alias=DMZ diff --git a/tools/saf51003I/20-eth10.link b/tools/saf51003I/20-eth10.link deleted file mode 100644 index 7d6ac36d..00000000 --- a/tools/saf51003I/20-eth10.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -Path=pci-0000:08:00.1* - -[Link] -Name=eth10 -Alias=WAN diff --git a/tools/saf51003I/90-saf51003I.chroot b/tools/saf51003I/90-saf51003I.chroot deleted file mode 100755 index aa4da964..00000000 --- a/tools/saf51003I/90-saf51003I.chroot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -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/saf51003I/99-default.link b/tools/saf51003I/99-default.link deleted file mode 100644 index e69de29b..00000000 diff --git a/tools/saf51003I/saf51003I b/tools/saf51003I/saf51003I deleted file mode 100755 index 7dcaf034..00000000 --- a/tools/saf51003I/saf51003I +++ /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/saf51015I/11-eth1.link b/tools/saf51015I/11-eth1.link deleted file mode 100644 index 16392247..00000000 --- a/tools/saf51015I/11-eth1.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:02:00.0* - -[Link] -Name=eth1 diff --git a/tools/saf51015I/12-eth2.link b/tools/saf51015I/12-eth2.link deleted file mode 100644 index 444f6c96..00000000 --- a/tools/saf51015I/12-eth2.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:03:00.0* - -[Link] -Name=eth2 diff --git a/tools/saf51015I/13-eth3.link b/tools/saf51015I/13-eth3.link deleted file mode 100644 index 2a2a41b8..00000000 --- a/tools/saf51015I/13-eth3.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:04:00.0* - -[Link] -Name=eth3 diff --git a/tools/saf51015I/14-eth4.link b/tools/saf51015I/14-eth4.link deleted file mode 100644 index 6a86ae67..00000000 --- a/tools/saf51015I/14-eth4.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:05:00.0* - -[Link] -Name=eth4 diff --git a/tools/saf51015I/15-eth5.link b/tools/saf51015I/15-eth5.link deleted file mode 100644 index 974084de..00000000 --- a/tools/saf51015I/15-eth5.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:06:00.0* - -[Link] -Name=eth5 diff --git a/tools/saf51015I/16-eth6.link b/tools/saf51015I/16-eth6.link deleted file mode 100644 index 26169369..00000000 --- a/tools/saf51015I/16-eth6.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:06:00.1* - -[Link] -Name=eth6 diff --git a/tools/saf51015I/17-eth7.link b/tools/saf51015I/17-eth7.link deleted file mode 100644 index 44346fb2..00000000 --- a/tools/saf51015I/17-eth7.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:06:00.2* - -[Link] -Name=eth7 diff --git a/tools/saf51015I/18-eth8.link b/tools/saf51015I/18-eth8.link deleted file mode 100644 index 12e3fa30..00000000 --- a/tools/saf51015I/18-eth8.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:06:00.3* - -[Link] -Name=eth8 diff --git a/tools/saf51015I/19-eth9.link b/tools/saf51015I/19-eth9.link deleted file mode 100644 index f67a3da9..00000000 --- a/tools/saf51015I/19-eth9.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:0a:00.0* - -[Link] -Name=eth9 diff --git a/tools/saf51015I/20-eth10.link b/tools/saf51015I/20-eth10.link deleted file mode 100644 index 1a6e959f..00000000 --- a/tools/saf51015I/20-eth10.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:0a:00.1* - -[Link] -Name=eth10 diff --git a/tools/saf51015I/21-eth11.link b/tools/saf51015I/21-eth11.link deleted file mode 100644 index e107e983..00000000 --- a/tools/saf51015I/21-eth11.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:0b:00.0* - -[Link] -Name=eth11 diff --git a/tools/saf51015I/22-eth12.link b/tools/saf51015I/22-eth12.link deleted file mode 100644 index e17caf5f..00000000 --- a/tools/saf51015I/22-eth12.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:0b:00.1* - -[Link] -Name=eth12 diff --git a/tools/saf51015I/90-saf51015I.chroot b/tools/saf51015I/90-saf51015I.chroot deleted file mode 100755 index aa4da964..00000000 --- a/tools/saf51015I/90-saf51015I.chroot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -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/saf51015I/99-default.link b/tools/saf51015I/99-default.link deleted file mode 100644 index e69de29b..00000000 diff --git a/tools/saf51015I/saf51015I b/tools/saf51015I/saf51015I deleted file mode 100755 index 7dcaf034..00000000 --- a/tools/saf51015I/saf51015I +++ /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/vendors_udev/64-vyos-SAF51003I-net.rules b/tools/vendors_udev/64-vyos-SAF51003I-net.rules new file mode 100644 index 00000000..0da995d0 --- /dev/null +++ b/tools/vendors_udev/64-vyos-SAF51003I-net.rules @@ -0,0 +1,14 @@ +ATTR{[dmi/id]board_name}!="SAF51003I", GOTO="end_ec_nic" + +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.0", ENV{VYOS_IFNAME}="eth1", ATTR{ifalias}="LAN1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.1", ENV{VYOS_IFNAME}="eth2", ATTR{ifalias}="LAN2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.2", ENV{VYOS_IFNAME}="eth3", ATTR{ifalias}="LAN3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.3", ENV{VYOS_IFNAME}="eth4", ATTR{ifalias}="LAN4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.0", ENV{VYOS_IFNAME}="eth5", ATTR{ifalias}="LAN5" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.1", ENV{VYOS_IFNAME}="eth6", ATTR{ifalias}="LAN6" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.2", ENV{VYOS_IFNAME}="eth7", ATTR{ifalias}="LAN7" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.3", ENV{VYOS_IFNAME}="eth8", ATTR{ifalias}="LAN8" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:08:00.0", ENV{VYOS_IFNAME}="eth9", ATTR{ifalias}="DMZ" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:08:00.1", ENV{VYOS_IFNAME}="eth10", ATTR{ifalias}="WAN" + +LABEL="end_ec_nic" \ No newline at end of file diff --git a/tools/vendors_udev/64-vyos-SAF51015I-net.rules b/tools/vendors_udev/64-vyos-SAF51015I-net.rules new file mode 100644 index 00000000..eab23bdb --- /dev/null +++ b/tools/vendors_udev/64-vyos-SAF51015I-net.rules @@ -0,0 +1,16 @@ +ATTR{[dmi/id]board_name}!="SAF51015I-0318-EC", GOTO="end_ec_nic" + +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.0", ENV{VYOS_IFNAME}="eth1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:03:00.0", ENV{VYOS_IFNAME}="eth2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:04:00.0", ENV{VYOS_IFNAME}="eth3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.0", ENV{VYOS_IFNAME}="eth4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:06:00.0", ENV{VYOS_IFNAME}="eth5" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:06:00.1", ENV{VYOS_IFNAME}="eth6" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:06:00.2", ENV{VYOS_IFNAME}="eth7" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:06:00.3", ENV{VYOS_IFNAME}="eth8" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:0a:00.0", ENV{VYOS_IFNAME}="eth9" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:0a:00.1", ENV{VYOS_IFNAME}="eth10" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:0b:00.0", ENV{VYOS_IFNAME}="eth11" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:0b:00.1", ENV{VYOS_IFNAME}="eth12" + +LABEL="end_ec_nic" -- cgit v1.2.3