From 588de35c42fba8f12bad6e1ed651bee3b8319378 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 13 Jul 2023 10:26:08 -0700 Subject: [PATCH] Update the regex for the boot loader. Upstream FreeBSD changed the autoboot countdown string in September of 2019 (merged to CheriBSD in late December 2022). The existing regex didn't match the new string, so test boots requesting a non-default kernel on Morello (e.g. the purecap kernel) have been booting the default (hybrid) kernel instead. This updates the regex to match on the new string as well as the old. --- pycheribuild/boot_cheribsd/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycheribuild/boot_cheribsd/__init__.py b/pycheribuild/boot_cheribsd/__init__.py index 11d7b81c5..0f414ab06 100755 --- a/pycheribuild/boot_cheribsd/__init__.py +++ b/pycheribuild/boot_cheribsd/__init__.py @@ -72,7 +72,7 @@ CompilationTargets.CHERIBSD_MORELLO_PURECAP, )} -AUTOBOOT_PROMPT = re.compile(r"(H|, h)it \[Enter] to boot ") +AUTOBOOT_PROMPT = re.compile(r"((H|, h)it \[Enter] to boot |\[Space] to pause)") BOOT_LOADER_PROMPT = "OK " STARTING_INIT = "start_init: trying /sbin/init"