diff options
| author | Daniil Baturin <daniil@baturin.org> | 2016-12-21 22:28:17 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2016-12-21 22:28:17 +0100 |
| commit | 53a878bb2d18a450f4096403d80461dd566ef29e (patch) | |
| tree | ad134111ddecb89af9db5f515fc334dba363fab8 | |
| parent | e119d44d2bc5b0fc8daa7a208199ad9448427af7 (diff) | |
| download | vyos-build-53a878bb2d18a450f4096403d80461dd566ef29e.tar.gz vyos-build-53a878bb2d18a450f4096403d80461dd566ef29e.zip | |
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.
| -rw-r--r-- | data/live-build-config/archives/vyos.list.chroot | 1 | ||||
| -rw-r--r-- | scripts/defaults.py | 1 | ||||
| -rwxr-xr-x | scripts/live-build-config | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/data/live-build-config/archives/vyos.list.chroot b/data/live-build-config/archives/vyos.list.chroot index 664b408c..2b117386 100644 --- a/data/live-build-config/archives/vyos.list.chroot +++ b/data/live-build-config/archives/vyos.list.chroot @@ -1,2 +1 @@ deb http://dev.packages.vyos.net/vyos current main -deb http://security.debian.org/ jessie/updates main diff --git a/scripts/defaults.py b/scripts/defaults.py index b9a3f255..0792d6b2 100644 --- a/scripts/defaults.py +++ b/scripts/defaults.py @@ -23,6 +23,7 @@ BUILD_CONFIG = os.path.join(BUILD_DIR, 'build-config.json') # The default mirror was chosen entirely at random DEBIAN_MIRROR = 'http://ftp.nl.debian.org/debian/' +DEBIAN_SECURITY_MIRROR = 'http://security.debian.org/' DEBIAN_DISTRIBUTION = 'jessie' diff --git a/scripts/live-build-config b/scripts/live-build-config index 52660571..6ac49bd7 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -49,7 +49,9 @@ lb config noauto \ --mirror-chroot {{debian_mirror}} \ --mirror-chroot-security {{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 "${@}" """ |