Skip to content

Commit

Permalink
Update the regex for the boot loader.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bsdjhb committed Jul 13, 2023
1 parent 67b0c48 commit 588de35
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pycheribuild/boot_cheribsd/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 588de35

Please sign in to comment.