diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-07 17:14:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-07 17:14:23 +0100 |
| commit | aeb94b726fd238e507cbeb4f6bad3909574871c1 (patch) | |
| tree | 8696658410c43316d3c80427e205230c04d0e80d /scripts | |
| parent | aa4ba3d95e162f1570330ca1787002d4239d583f (diff) | |
| parent | f8b88e54bc5a0b9f3466699c94b63decd2502d57 (diff) | |
| download | vyos-build-aeb94b726fd238e507cbeb4f6bad3909574871c1.tar.gz vyos-build-aeb94b726fd238e507cbeb4f6bad3909574871c1.zip | |
Merge pull request #877 from c-po/os-release-T7019
T7019: use VyOS release train in /etc/os-release codename over Debian release
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 4eb5dd16..11083706 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -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): """ diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 1fc2c6c3..65891aa1 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -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']}" |