mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
T7019: use VyOS release train in /etc/os-release codename over Debian release
VyOS is based on Debian * VyOS 1.3 -> Debian Buster (VyOS equuleus) * VyOS 1.4 -> Debian Bookworm (VyOS sagitta) * VyOS 1.5 -> Debian Bookworm (and then trixie) (VyOS circinus) * VyOS rolling -> Debian Bookworm (and then trixie) (VyOS t.b.d.) When running vyos@vyos:~$ lsb_release -a Distributor ID: VyOS Description: VyOS 1.5-rolling-202501031241 (current) Release: 1.5-rolling-202501031241 Codename: bookworm The codename in use is the Debian base distribution. This should be changed to the VyOS release name.
This commit is contained in:
parent
aa4ba3d95e
commit
f8b88e54bc
@ -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):
|
||||
"""
|
||||
|
||||
@ -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']}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user