lb-config improvements: force firmware packages to be added to the image,

and make security mirror configurable.
XXX: need to find out how to make --security work too.
This commit is contained in:
Daniil Baturin 2016-12-21 22:28:17 +01:00
parent e119d44d2b
commit 53a878bb2d
3 changed files with 4 additions and 2 deletions

View File

@ -1,2 +1 @@
deb http://dev.packages.vyos.net/vyos current main deb http://dev.packages.vyos.net/vyos current main
deb http://security.debian.org/ jessie/updates main

View File

@ -23,6 +23,7 @@ BUILD_CONFIG = os.path.join(BUILD_DIR, 'build-config.json')
# The default mirror was chosen entirely at random # The default mirror was chosen entirely at random
DEBIAN_MIRROR = 'http://ftp.nl.debian.org/debian/' DEBIAN_MIRROR = 'http://ftp.nl.debian.org/debian/'
DEBIAN_SECURITY_MIRROR = 'http://security.debian.org/'
DEBIAN_DISTRIBUTION = 'jessie' DEBIAN_DISTRIBUTION = 'jessie'

View File

@ -49,7 +49,9 @@ lb config noauto \
--mirror-chroot {{debian_mirror}} \ --mirror-chroot {{debian_mirror}} \
--mirror-chroot-security {{debian_mirror}} \ --mirror-chroot-security {{debian_mirror}} \
--mirror-binary {{debian_mirror}} \ --mirror-binary {{debian_mirror}} \
--mirror-binary-security {{debian_mirror}} --mirror-binary-security {{debian_security_mirror}} \
--archive-areas "main contrib non-free" \
--firmware-chroot true
"${@}" "${@}"
""" """