Commits on Jul 13, 2023

1. boot_cheribsd: Check loader prompt was used if needed to pick kernel …

   When booting an image with a non-default kernel on a platform using
   loader rather than direct booting (e.g. Morello), expect needs to
   interrupt the loader and select the alternate kernel before booting, but
   we weren't checking we managed to do this, only that if we saw the
   loader countdown we were able to interrupt it. Thus add a check to fail
   if the boot gets to single user (mounting root) without having seen the
   loader prompt.

   

   jrtc27 authored and bsdjhb committed Jul 13, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for 482d7ad
   • Browse repository at this point

   Copy the full SHA

   482d7ad View commit details

   Browse the repository at this point in the history

2. 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.

   

   bsdjhb committed Jul 13, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for a5dfcbf
   • Browse repository at this point

   Copy the full SHA

   a5dfcbf View commit details

   Browse the repository at this point in the history

3. Replace str.format() calls with f strings to appease ruff.

   

   bsdjhb committed Jul 13, 2023
   Configuration menu

   • View commit details
   • Copy full SHA for 7a7e0b2
   • Browse repository at this point

   Copy the full SHA

   7a7e0b2 View commit details

   Browse the repository at this point in the history