diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-config | 1 | ||||
| -rw-r--r-- | scripts/defaults.py | 2 | ||||
| -rwxr-xr-x | scripts/live-build-config | 3 | 
3 files changed, 6 insertions, 0 deletions
| diff --git a/scripts/build-config b/scripts/build-config index 008311ad..76e83192 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -57,6 +57,7 @@ options = {     'debian-mirror': ('Debian repository mirror for ISO build', lambda: defaults.DEBIAN_MIRROR, None),     'debian-security-mirror': ('Debian security updated mirror', lambda: defaults.DEBIAN_SECURITY_MIRROR, None),     'pbuilder-debian-mirror': ('Debian repository mirror for pbuilder env bootstrap', lambda: defaults.DEBIAN_MIRROR, None), +   'salt-mirror': ('Salt package mirror', lambda: defaults.SALT_MIRROR, None),     'vyos-mirror': ('VyOS package mirror', lambda: defaults.VYOS_MIRROR, None),     'build-type': ('Build type, release or development', lambda: 'development', lambda x: x in ['release', 'development']),     'custom-packages': ('Custom packages to install from repositories', lambda: '', None), diff --git a/scripts/defaults.py b/scripts/defaults.py index 392af475..c83ce172 100644 --- a/scripts/defaults.py +++ b/scripts/defaults.py @@ -27,6 +27,8 @@ DEBIAN_SECURITY_MIRROR = 'http://deb.debian.org/debian-security'  DEBIAN_DISTRIBUTION = 'jessie' +SALT_MIRROR = 'http://repo.saltstack.com/apt/debian/8/amd64/latest' +  PBUILDER_CONFIG = os.path.join(BUILD_DIR, 'pbuilderrc')  PBUILDER_DIR = os.path.join(BUILD_DIR, 'pbuilder') diff --git a/scripts/live-build-config b/scripts/live-build-config index 6efa0a8c..8c843bcb 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -69,6 +69,7 @@ debug = build_config['debug']  print("Setting up additional APT entries")  vyos_repo_entry = "deb {0}/vyos {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])  vyos_debian_repo_entry = "deb {0}/debian {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) +salt_repo_entry = "deb {0} {1} main\n".format(build_config['salt_mirror'], build_config['distribution'])  apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE) @@ -76,10 +77,12 @@ if debug:      print("Adding these entries to {0}:".format(apt_file))      print("\t", vyos_repo_entry)      print("\t", vyos_debian_repo_entry) +    print("\t", salt_repo_entry)  with open(apt_file, 'w') as f:      f.write(vyos_repo_entry)      f.write(vyos_debian_repo_entry) +    f.write(salt_repo_entry)  # Add custom APT entries  if build_config['custom_apt_entry']: | 
