diff options
| author | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-07-22 21:54:20 +0200 |
| commit | 6056acfa06c2b79ee8981b9f36a1ced2dac29111 (patch) | |
| tree | 613944f1de089105950a86501507b6aa2151380d /scripts/build-config | |
| parent | b229f0bd958a42c6faa345c91500c2ed8ccdc919 (diff) | |
| parent | 8c22ceead487b745d6b7c058c4d1c0a0eaa051c8 (diff) | |
| download | vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.tar.gz vyos-build-6056acfa06c2b79ee8981b9f36a1ced2dac29111.zip | |
Merge remote-tracking branch 'origin/current' into equuleus
fixed merge errors in:
* scripts/live-build-config
- kernel parameters
* scripts/build-packages
- fixed list of packages to compile
Diffstat (limited to 'scripts/build-config')
| -rwxr-xr-x | scripts/build-config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build-config b/scripts/build-config index a12ecdc4..dd74a50e 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -67,7 +67,7 @@ options = { 'architecture': ('Image target architecture (amd64 or i386 or armhf)', lambda: build_defaults['architecture'], lambda x: x in ['amd64', 'i386', 'armhf']), 'build-by': ('Builder identifier (e.g. jrandomhacker@example.net)', get_default_build_by, None), 'debian-mirror': ('Debian repository mirror for ISO build', lambda: build_defaults['debian_mirror'], None), - 'debian-security-mirror': ('Debian security updated mirror', lambda: build_defaults['debian_security_mirror'], None), + 'debian-security-mirror': ('Debian security updates mirror', lambda: build_defaults['debian_security_mirror'], None), 'pbuilder-debian-mirror': ('Debian repository mirror for pbuilder env bootstrap', lambda: build_defaults['debian_mirror'], None), 'vyos-mirror': ('VyOS package mirror', lambda: build_defaults["vyos_mirror"], None), 'build-type': ('Build type, release or development', lambda: 'development', lambda x: x in ['release', 'development']), |