diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-01-24 09:46:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-24 09:46:46 +0100 |
| commit | 32552c905139bc5648b1f7eb49a90ce1bcff789f (patch) | |
| tree | f3c3264c235e22ce4ff0fd90214d90b4defde060 /data | |
| parent | a5f5cbd379de8f4459988fb0ce7ccac1b4e2aa2c (diff) | |
| parent | 606c00f95d27e93e0dbb0649665d8f10c97c49f8 (diff) | |
| download | vyos-build-32552c905139bc5648b1f7eb49a90ce1bcff789f.tar.gz vyos-build-32552c905139bc5648b1f7eb49a90ce1bcff789f.zip | |
Merge pull request #1108 from asklymenko/patch-4
T8198: Use zabbix-agent2 from Debian backports
Diffstat (limited to 'data')
| -rw-r--r-- | data/architectures/amd64.toml | 3 | ||||
| -rw-r--r-- | data/architectures/arm64.toml | 3 | ||||
| -rw-r--r-- | data/live-build-config/archives/bookworm-backports.pref.chroot | 4 | ||||
| -rw-r--r-- | data/live-build-config/archives/zabbix-official-repo.key.chroot | bin | 1183 -> 0 bytes |
4 files changed, 4 insertions, 6 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 8676ad2f..acebec1c 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -16,6 +16,3 @@ packages = [ architecture = "amd64" url = "https://packages.vyos.net/saltproject/debian/11/amd64/3005" distribution = "bullseye" - -[additional_repositories.zabbix] - url = "https://repo.zabbix.com/zabbix/6.0/debian" diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index 0447d846..36b2fe07 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -9,6 +9,3 @@ squashfs_compression_type = "xz -b 256k -always-use-fragments -no-recovery" architecture = "arm64" url = "https://packages.vyos.net/saltproject/debian/11/arm64/3005" distribution = "bullseye" - -[additional_repositories.zabbix] - url = "https://repo.zabbix.com/zabbix/6.0/debian-arm64" diff --git a/data/live-build-config/archives/bookworm-backports.pref.chroot b/data/live-build-config/archives/bookworm-backports.pref.chroot index 27a0ab0d..f2c79d62 100644 --- a/data/live-build-config/archives/bookworm-backports.pref.chroot +++ b/data/live-build-config/archives/bookworm-backports.pref.chroot @@ -6,6 +6,10 @@ Package: suricata libhtp2 Pin: release n=bookworm-backports Pin-Priority: 600 +Package: zabbix-agent2 +Pin: release n=bookworm-backports +Pin-Priority: 600 + Package: * Pin: release n=bookworm-backports Pin-Priority: -100 diff --git a/data/live-build-config/archives/zabbix-official-repo.key.chroot b/data/live-build-config/archives/zabbix-official-repo.key.chroot Binary files differdeleted file mode 100644 index 660c453a..00000000 --- a/data/live-build-config/archives/zabbix-official-repo.key.chroot +++ /dev/null |