Merge pull request #877 from c-po/os-release-T7019

T7019: use VyOS release train in /etc/os-release codename over Debian release
This commit is contained in:
Christian Breunig 2025-01-07 17:14:23 +01:00 committed by GitHub
commit aeb94b726f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -107,7 +107,7 @@ with open('build/manifest.json', 'rb') as f:
manifest = json.load(f)
vyos_version = manifest['build_config']['version']
vyos_codename = manifest['build_config']['debian_distribution']
vyos_codename = manifest['build_config']['release_train']
class StreamToLogger(object):
"""

View File

@ -462,7 +462,7 @@ if __name__ == "__main__":
NAME="VyOS"
VERSION_ID="{version}"
VERSION="{version} ({build_config['release_train']})"
VERSION_CODENAME={build_defaults['debian_distribution']}
VERSION_CODENAME={build_defaults['release_train']}
ID=vyos
BUILD_ID="{build_git}"
HOME_URL="{build_defaults['website_url']}"