vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #849 from dmbaturin/T6923-deb-security-urls

Browse Source 
build: T6923: use the Debian mirror for security updates if it's specified explicitly
This commit is contained in:
Christian Breunig 2024-11-30 12:42:51 +01:00 committed by GitHub
commit 5bccbebc1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/image-build/build-vyos-image
View File

@ -261,14 +261,18 @@ if __name__ == "__main__":
pre_build_config = merge_defaults(args, defaults=pre_build_config, skip_none=True) pre_build_config = merge_defaults(args, defaults=pre_build_config, skip_none=True)
# Some fixup for mirror settings. # Some fixup for mirror settings.
# The idea is: if --debian-mirror is specified but --pbuilder-debian-mirror is not, # The idea is: if --debian-mirror is specified
# use the --debian-mirror value for both lb and pbuilder bootstrap # but --pbuilder-debian-mirror or --debian-security-mirror are not,
if pre_build_config['debian_mirror'] is None or pre_build_config['debian_security_mirror'] is None: # use the --debian-mirror value for those
print("E: debian_mirror and debian_security_mirror cannot be empty") if pre_build_config['debian_mirror'] is None:
print("E: debian_mirror must be specified")
sys.exit(1) sys.exit(1)
if pre_build_config['pbuilder_debian_mirror'] is None: if pre_build_config['pbuilder_debian_mirror'] is None:
args['pbuilder_debian_mirror'] = pre_build_config['pbuilder_debian_mirror'] = pre_build_config['debian_mirror'] pre_build_config['pbuilder_debian_mirror'] = pre_build_config['debian_mirror']
if pre_build_config['debian_security_mirror'] is None:
pre_build_config['debian_security_mirror'] = pre_build_config['debian_mirror']
# Validate characters in version name # Validate characters in version name
if args.get('version'): if args.get('version'):
@ -300,6 +304,11 @@ if __name__ == "__main__":
build_config = merge_defaults(flavor_config, defaults=build_config) build_config = merge_defaults(flavor_config, defaults=build_config)
build_config = merge_defaults(args, defaults=build_config, skip_none=True) build_config = merge_defaults(args, defaults=build_config, skip_none=True)
# If Debian mirror is specified explicitly but Debian security mirror is not,
# assume that the user wants to use that mirror for security updates as well.
if (args['debian_mirror'] is not None) and (args['debian_security_mirror'] is None):
build_config['debian_security_mirror'] = args['debian_mirror']
## Rename and merge some fields for simplicity ## Rename and merge some fields for simplicity
## E.g. --custom-packages is for the user, but internally ## E.g. --custom-packages is for the user, but internally
## it's added to the same package list as everything else ## it's added to the same package list as everything else