From 818ca72288a957dc06eec8f6751e7040a2b81205 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 31 Jul 2023 07:53:08 -0700 Subject: [PATCH] Fix incorrect pexpect pattern list while booting This was causing errors while booting the Morello purecap kernel --- 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 efeab1e1a..a943b2fe1 100755 --- a/pycheribuild/boot_cheribsd/__init__.py +++ b/pycheribuild/boot_cheribsd/__init__.py @@ -901,7 +901,7 @@ def boot_and_login(child: CheriBSDSpawnMixin, *, starttime, kernel_init_only=Fal else: failure(f"Did not find expected kernel ABI message '{expected_kernel_abi_msg}'," f" got '{child.match.group(0)}' instead.", exit=True) - i = child.expect(init_messages, timeout=10 * 60, timeout_msg="timeout before /sbin/init") + i = child.expect(boot_messages, timeout=10 * 60, timeout_msg="timeout mounting rootfs") if i == boot_messages.index(TRYING_TO_MOUNT_ROOT): success("===> mounting rootfs")