From 34d54e8c931585b27d093de875bdd277c662b89a Mon Sep 17 00:00:00 2001 From: James Simpson Date: Mon, 7 Nov 2022 13:45:31 +0800 Subject: T4796: Move additional_repositories Declare in architectures/amd64, not in defaults --- data/architectures/amd64.toml | 9 +++++++-- data/defaults.toml | 5 ----- 2 files changed, 7 insertions(+), 7 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/defaults.toml b/data/defaults.toml index b14fceeb..2819b216 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,11 +14,6 @@ release_train = "current" kernel_version = "5.15.77" -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" -] - website_url = "https://vyos.io" support_url = "https://support.vyos.io" bugtracker_url = "https://phabricator.vyos.net" -- cgit v1.2.3