diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-08-14 22:01:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-14 22:01:55 +0200 |
| commit | aeb34831d4ec120acbeb16e3ca103a6eff5c7a54 (patch) | |
| tree | f5d9532cb6fd819a43f40f091d7af8d80a2b7875 /scripts | |
| parent | aee889f73f9cb4abb87576fefa5465e9ddb79742 (diff) | |
| parent | 7c33698e18cdf77d6c0faa36ec20452df391f470 (diff) | |
| download | vyos-build-aeb34831d4ec120acbeb16e3ca103a6eff5c7a54.tar.gz vyos-build-aeb34831d4ec120acbeb16e3ca103a6eff5c7a54.zip | |
Merge pull request #1269 from c-po/testsuite-grub-boot-race
Testsuite: T9214: fix GRUB auto-boot race in console-select navigation
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index a2993cf0..49699a8f 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -595,12 +595,18 @@ def BOOTLOADERchooseSerialConsole(child, live: bool) -> None: # Wait for GRUB child.expect(GRUB_STRING, timeout=BOOTLOADER_TMO) - time.sleep(BOOTLOADER_LOAD_TMO) + # Unlike the live ISO menus (10s timeout), the installed system's + # top-level menu auto-boots its default entry after ~BOOTLOADER_LOAD_TMO + # seconds - the same delay this script would otherwise sleep before + # sending any key. Under host load that leaves no margin: GRUB can + # auto-boot before "Boot options" is ever selected. Send the first + # navigation key immediately to cancel the countdown, then give the + # screen time to settle. # Select GRUB serial console # Boot options child.send(KEY_DOWN) - time.sleep(BOOTLOADER_SLEEP) + time.sleep(BOOTLOADER_LOAD_TMO) child.send(KEY_RETURN) time.sleep(BOOTLOADER_SLEEP) # GRUB submenus never time out on their own, so confirm we actually |