diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/architectures/amd64.toml | 9 | ||||
| -rw-r--r-- | data/architectures/arm64.toml | 1 | ||||
| -rw-r--r-- | data/build-types/development.toml | 1 | ||||
| -rw-r--r-- | data/defaults.toml | 8 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/41-init-podman-images.chroot | 8 |
5 files changed, 10 insertions, 17 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 02027aa6..abfec53a 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -1,3 +1,10 @@ +additional_repositories = [ + "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main", + "deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-48 main" +] + +kernel_flavor = "amd64-vyos" + # Packages added to images for x86 by default packages = [ "grub2", @@ -6,5 +13,3 @@ packages = [ "vyos-intel-qat", "telegraf" ] - -kernel_flavor = "amd64-vyos" diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index fbd30008..8ba3805a 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -1,2 +1,3 @@ # Packages included in ARM64 images by default packages = ["grub-efi-arm"] +bootloaders = "grub-efi"
\ No newline at end of file diff --git a/data/build-types/development.toml b/data/build-types/development.toml index 31c50522..f0207a6a 100644 --- a/data/build-types/development.toml +++ b/data/build-types/development.toml @@ -2,7 +2,6 @@ packages = [ "gdb", "strace", "apt-rdepends", - "skopeo", "tshark", "vim", "vyos-1x-smoketest" diff --git a/data/defaults.toml b/data/defaults.toml index 28db3067..bb14458c 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -12,12 +12,8 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/current" vyos_branch = "current" release_train = "current" -kernel_version = "5.15.76" - -additional_repositories = [ - "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main", - "deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-48 main" -] +kernel_version = "5.15.79" +bootloaders = "syslinux,grub-efi" website_url = "https://vyos.io" support_url = "https://support.vyos.io" diff --git a/data/live-build-config/hooks/live/41-init-podman-images.chroot b/data/live-build-config/hooks/live/41-init-podman-images.chroot deleted file mode 100755 index 1915a40f..00000000 --- a/data/live-build-config/hooks/live/41-init-podman-images.chroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Download busybox container image for smoketests (only ~1MB) -# Skopeo only added on development builds - -if command -v skopeo &>/dev/null; then - skopeo copy --additional-tag docker.io/library/busybox:stable docker://docker.io/library/busybox:stable docker-archive://usr/share/vyos/busybox-stable.tar -fi |