diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-04 21:13:49 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-09-07 21:31:46 +0200 |
| commit | fd7d1d0d208f5857d84f1bc48577ff775a67b823 (patch) | |
| tree | 1bc41376624394fc4d9f6bc940bacb7e1ba60115 /scripts/check-qemu-install | |
| parent | ae3e89deeaf80eb2457aa9235e19e9da1fb2f1ad (diff) | |
| download | vyos-build-fd7d1d0d208f5857d84f1bc48577ff775a67b823.tar.gz vyos-build-fd7d1d0d208f5857d84f1bc48577ff775a67b823.zip | |
Kernel: T861: remove superfluous architecture from Kernel string
Diffstat (limited to 'scripts/check-qemu-install')
| -rwxr-xr-x | scripts/check-qemu-install | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index ea3aef63..fe781b60 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019-2023, VyOS maintainers and contributors +# Copyright (C) 2019-2024, VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -47,6 +47,8 @@ import tomli from io import BytesIO from io import StringIO from datetime import datetime +from pathlib import Path +from tomllib import loads as toml_loads EXCEPTION = 0 now = datetime.now() @@ -416,8 +418,11 @@ try: c.expect(op_mode_prompt) c.sendline('show version') c.expect(op_mode_prompt) + c.sendline('show version kernel') - c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["architecture"]}-vyos') + kernel_flavor = toml_loads(Path('data/architectures/amd64.toml').read_text()).get('kernel_flavor') + c.expect(f'{vyos_defaults["kernel_version"]}-{kernel_flavor}') + c.expect(op_mode_prompt) c.sendline('show version frr') c.expect(op_mode_prompt) |