diff options
35 files changed, 383 insertions, 232 deletions
diff --git a/data/build-flavors/dell-vep1400.toml b/data/build-flavors/dell-vep1400.toml new file mode 100644 index 00000000..8ce3d8b6 --- /dev/null +++ b/data/build-flavors/dell-vep1400.toml @@ -0,0 +1,116 @@ +# ISO image for Dell VEP4600 devices + +image_formats = "iso" + +# Replace built-in NIC naming rules with empty files +# to prevent them from taking any effect + +[[includes_chroot]] + path = "lib/systemd/network/99-default.link" + data = '' + +[[includes_chroot]] + path = "lib/udev/rules.d/65-vyatta-net.rules" + data = '' + +[[includes_chroot]] + path = "lib/udev/rules.d/75-persistent-net-generator.rules" + data = '' + +# Install platform-specific link files + +[[includes_chroot]] + path = "etc/systemd/network/10-eth0-000.link" + data = ''' +[Match] +Path=pci-0000:05:00.1 +Driver=ixgbe + +[Link] +Name=eth0 +Alias=SFP+1 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth1-000.link" + data = ''' +[Match] +Path=pci-0000:05:00.0 +Driver=ixgbe + +[Link] +Name=eth1 +Alias=SFP+2 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth2-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.2 +Driver=igb + +[Link] +Name=eth2 +Alias=GE1 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth3-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.3 +Driver=igb + +[Link] +Name=eth3 +Alias=GE2 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth4-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.0 +Driver=igb + +[Link] +Name=eth4 +Alias=GE3 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth5-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.1 +Driver=igb + +[Link] +Name=eth5 +Alias=GE4 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth6-000.link" + data = ''' +[Match] +Path=pci-0000:07:00.1 +Driver=ixgbe + +[Link] +Name=eth6 +Alias=GE5 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth7-000.link" + data = ''' +[Match] +Path=pci-0000:07:00.0 +Driver=ixgbe + +[Link] +Name=eth7 +Alias=GE6 +''' diff --git a/data/build-flavors/dell-vep4600.toml b/data/build-flavors/dell-vep4600.toml new file mode 100644 index 00000000..97256b41 --- /dev/null +++ b/data/build-flavors/dell-vep4600.toml @@ -0,0 +1,267 @@ +# ISO image for Dell VEP4600 devices + +image_formats = "iso" + +# Replace built-in NIC naming rules with empty files +# to prevent them from taking any effect + +[[includes_chroot]] + path = "lib/systemd/network/99-default.link" + data = '' + +[[includes_chroot]] + path = "lib/udev/rules.d/65-vyatta-net.rules" + data = '' + +[[includes_chroot]] + path = "lib/udev/rules.d/75-persistent-net-generator.rules" + data = '' + +# Install platform-specific link files + +[[includes_chroot]] + path = "etc/systemd/network/10-eth0-000.link" + data = ''' +[Match] +Path=pci-0000:04:00.0 +Driver=igb + +[Link] +Name=eth0 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth0-001.link" + data = ''' +[Match] +Path=pci-0000:05:00.0 +Driver=igb + +[Link] +Name=eth0 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth10-000.link" + data = ''' +[Match] +Path=pci-0000:65:00.3 +Driver=i40e + +[Link] +Name=eth10 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth1-000.link" + data = ''' +[Match] +Path=pci-0000:b8:00.0 +Driver=i40e + +[Link] +Name=eth1 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth1-001.link" + data = ''' +[Match] +Path=pci-0000:b6:00.0 +Driver=i40e + +[Link] +Name=eth1 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth11-000.link" + data = ''' +[Match] +Path=pci-0000:17:00.0 +Driver=i40e + +[Link] +Name=eth11 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth12-000.link" + data = ''' +[Match] +Path=pci-0000:17:00.1 +Driver=i40e + +[Link] +Name=eth12 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth13-000.link" + data = ''' +[Match] +Path=pci-0000:17:00.2 +Driver=i40e + +[Link] +Name=eth13 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth14-000.link" + data = ''' +[Match] +Path=pci-0000:17:00.3 +Driver=i40e + +[Link] +Name=eth14 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth2-000.link" + data = ''' +[Match] +Path=pci-0000:b8:00.1 +Driver=i40e + +[Link] +Name=eth2 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth2-001.link" + data = ''' +[Match] +Path=pci-0000:b6:00.1 +Driver=i40e + +[Link] +Name=eth2 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth3-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.1 +Driver=igb + +[Link] +Name=eth3 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth4-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.0 +Driver=igb + +[Link] +Name=eth4 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth5-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.3 +Driver=igb + +[Link] +Name=eth5 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth6-000.link" + data = ''' +[Match] +Path=pci-0000:02:00.2 +Driver=igb + +[Link] +Name=eth6 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth7-000.link" + data = ''' +[Match] +Path=pci-0000:65:00.0 +Driver=i40e + +[Link] +Name=eth7 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth8-000.link" + data = ''' +[Match] +Path=pci-0000:65:00.1 +Driver=i40e + +[Link] +Name=eth8 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-eth9-000.link" + data = ''' +[Match] +Path=pci-0000:65:00.2 +Driver=i40e + +[Link] +Name=eth9 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-unused0-000.link" + data = ''' +[Match] +Path=pci-0000:b8:00.2 +Driver=i40e + +[Link] +Name=unused0 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-unused0-001.link" + data = ''' +[Match] +Path=pci-0000:b6:00.2 +Driver=i40e + +[Link] +Name=unused0 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-unused1-000.link" + data = ''' +[Match] +Path=pci-0000:b8:00.3 +Driver=i40e + +[Link] +Name=unused1 +''' + +[[includes_chroot]] + path = "etc/systemd/network/10-unused1-001.link" + data = ''' +[Match] +Path=pci-0000:b6:00.3 +Driver=i40e + +[Link] +Name=unused1 +''' + +[[includes_chroot]] + path = "etc/systemd/network/99-default.link" + data = ''' +''' 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 |