diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-05 20:00:49 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-01-05 20:00:49 +0100 |
| commit | f8b88e54bc5a0b9f3466699c94b63decd2502d57 (patch) | |
| tree | 8696658410c43316d3c80427e205230c04d0e80d /scripts | |
| parent | aa4ba3d95e162f1570330ca1787002d4239d583f (diff) | |
| download | vyos-build-f8b88e54bc5a0b9f3466699c94b63decd2502d57.tar.gz vyos-build-f8b88e54bc5a0b9f3466699c94b63decd2502d57.zip | |
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.
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']}" |