summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2022-11-07 16:43:58 +0000
committerGitHub <noreply@github.com>2022-11-07 16:43:58 +0000
commit1b94e4fce8c0135e36c5209109eec8be79cecfeb (patch)
treea795d4ee61493fde17d52e9e9dea9cc110e84369 /data
parentbadf55cd2d8bb7c8e2b80d60b48e15e6665128da (diff)
parentf4bfaa9b9782a7b255f9240270e4629711b62f86 (diff)
downloadvyos-build-1b94e4fce8c0135e36c5209109eec8be79cecfeb.tar.gz
vyos-build-1b94e4fce8c0135e36c5209109eec8be79cecfeb.zip
Merge pull request #278 from jsimpso/current
T4796: Fix some bugs in the build-vyos-image script
Diffstat (limited to 'data')
-rw-r--r--data/architectures/amd64.toml9
-rw-r--r--data/defaults.toml5
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"