From bf66214dad7a7d9830f89cc3bd5405fc58a4497d Mon Sep 17 00:00:00 2001
From: sskaje <sskaje@gmail.com>
Date: Wed, 29 Mar 2023 16:49:32 +0800
Subject: T5122: Move archive-areas to defaults.toml to support
non-free-firmware repository
---
data/defaults.toml | 2 ++
scripts/build-vyos-image | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/data/defaults.toml b/data/defaults.toml
index 01551111..bbdf65e9 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -7,6 +7,8 @@ debian_distribution = "bookworm"
debian_mirror = "http://deb.debian.org/debian"
debian_security_mirror = "http://deb.debian.org/debian-security"
+debian_archive_areas = "main contrib non-free"
+
vyos_mirror = "http://dev.packages.vyos.net/repositories/current"
vyos_branch = "current"
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image
index f09791d9..b3b3fc77 100755
--- a/scripts/build-vyos-image
+++ b/scripts/build-vyos-image
@@ -439,7 +439,7 @@ if __name__ == "__main__":
--mirror-chroot-security {{debian_security_mirror}} \
--mirror-binary {{debian_mirror}} \
--mirror-binary-security {{debian_security_mirror}} \
- --archive-areas "main contrib non-free" \
+ --archive-areas {{debian_archive_areas}} \
--firmware-chroot false \
--firmware-binary false \
--updates true \
--
cgit v1.2.3