diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-10-18 17:00:11 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-10-18 17:00:11 +0200 |
| commit | 9953ecffd4d237491f00eb148b9b345cdf78d923 (patch) | |
| tree | f2d5a27d585ff7bbfb783a81bbd19f0d4c6f0222 | |
| parent | 52012629f83cdf68eb505f3c65efe817d7c953b4 (diff) | |
| parent | 167cba6556c84deacf5b8864eb8bcdf9051f25e3 (diff) | |
| download | vyos-build-9953ecffd4d237491f00eb148b9b345cdf78d923.tar.gz vyos-build-9953ecffd4d237491f00eb148b9b345cdf78d923.zip | |
Merge branch 'vyos:current' into current
| -rw-r--r-- | data/architectures/amd64.toml | 3 | ||||
| -rw-r--r-- | data/architectures/arm64.toml | 3 | ||||
| -rw-r--r-- | data/live-build-config/archives/zabbix-official-repo.key.chroot | bin | 0 -> 1183 bytes |
3 files changed, 4 insertions, 2 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 79922d7e..5c83a660 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -1,5 +1,6 @@ additional_repositories = [ - "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main" + "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3005 bullseye main", + "deb https://repo.zabbix.com/zabbix/6.0/debian bookworm main" ] # Packages added to images for x86 by default diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index 228d0f3f..c64e19a1 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -1,5 +1,6 @@ additional_repositories = [ - "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main" + "deb [arch=arm64] https://repo.saltproject.io/py3/debian/11/arm64/3005 bullseye main", + "deb https://repo.zabbix.com/zabbix/6.0/debian-arm64 bookworm main" ] # Packages included in ARM64 images by default 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 differnew file mode 100644 index 00000000..660c453a --- /dev/null +++ b/data/live-build-config/archives/zabbix-official-repo.key.chroot |