summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/build-flavors/dell-vep1400.toml116
-rw-r--r--data/build-flavors/dell-vep4600.toml267
-rw-r--r--data/defaults.toml2
-rwxr-xr-xdata/live-build-config/hooks/live/18-enable-disable_services.chroot3
-rw-r--r--data/live-build-config/includes.binary/isolinux/splash.pngbin40176 -> 39611 bytes
-rw-r--r--data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default10
-rw-r--r--data/live-build-config/includes.chroot/usr/share/vyos/keys/vyos-rolling-release.minisign.pub4
7 files changed, 396 insertions, 6 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/data/defaults.toml b/data/defaults.toml
index 9a655c4f..c4d5c32c 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current"
vyos_branch = "current"
release_train = "current"
-kernel_version = "6.6.22"
+kernel_version = "6.6.29"
bootloaders = "syslinux,grub-efi"
squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"
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 08404a62..4680c869 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
@@ -21,7 +21,6 @@ systemctl disable conntrackd.service
systemctl disable 'udp-broadcast-relay@*.service'
systemctl disable pdns-recursor.service
systemctl disable tftpd-hpa.service
-systemctl disable logd.service
systemctl disable frr.service
systemctl disable salt-minion.service
systemctl disable certbot.service
@@ -29,7 +28,6 @@ systemctl disable certbot.timer
systemctl disable nginx.service
systemctl disable wpa_supplicant.service
systemctl disable squid.service
-systemctl disable heartbeat.service
systemctl disable apt-daily.service
systemctl disable apt-daily.timer
systemctl disable apt-daily-upgrade.timer
@@ -70,7 +68,6 @@ systemctl disable podman-auto-update.timer
systemctl disable podman-restart.service
systemctl disable vyos-wan-load-balance.service
systemctl disable nvmf-autoconnect.service
-systemctl disable vpp.service
systemctl disable dpkg-db-backup.timer
systemctl disable dpkg-db-backup.service
systemctl disable zabbix-agent2.service
diff --git a/data/live-build-config/includes.binary/isolinux/splash.png b/data/live-build-config/includes.binary/isolinux/splash.png
index 932ca36e..4137d52b 100644
--- a/data/live-build-config/includes.binary/isolinux/splash.png
+++ b/data/live-build-config/includes.binary/isolinux/splash.png
Binary files differ
diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
index 7123ef54..c3ff6c79 100644
--- a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
+++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
@@ -19,6 +19,16 @@ system {
}
}
ntp {
+ allow-client {
+ address 127.0.0.0/8
+ address 169.254.0.0/16
+ address 10.0.0.0/8
+ address 172.16.0.0/12
+ address 192.168.0.0/16
+ address ::1/128
+ address fe80::/10
+ address fc00::/7
+ }
server "time1.vyos.net"
server "time2.vyos.net"
server "time3.vyos.net"
diff --git a/data/live-build-config/includes.chroot/usr/share/vyos/keys/vyos-rolling-release.minisign.pub b/data/live-build-config/includes.chroot/usr/share/vyos/keys/vyos-rolling-release.minisign.pub
index 29a30825..320b41c4 100644
--- a/data/live-build-config/includes.chroot/usr/share/vyos/keys/vyos-rolling-release.minisign.pub
+++ b/data/live-build-config/includes.chroot/usr/share/vyos/keys/vyos-rolling-release.minisign.pub
@@ -1,2 +1,2 @@
-untrusted comment: minisign public key 21AF69D8B86794DC
-RWTclGe42GmvIX/xnNiXdigNll7NSfpYGl1rj+sEERcLgoEsse5EwAgA
+untrusted comment: minisign public key D3643767F448688
+RWSIhkR/dkM2DSaBRniv/bbbAf8hmDqdbOEmgXkf1RxRoxzodgKcDyGq
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 10:55:32 +0000