diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2021-11-04 09:42:04 -0700 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2021-11-04 09:45:25 -0700 |
| commit | c5268bbdbb441e1c497d59163872ddfba9bf67cf (patch) | |
| tree | 09377985de228b601a8f41c4266f971d05ac0d5f /ironic_python_agent/extensions | |
| parent | 65827b3015a2ec513a8430c583c2f91b11cd3db5 (diff) | |
| download | ironic-python-agent-c5268bbdbb441e1c497d59163872ddfba9bf67cf.tar.gz | |
Fix UEFI record regex
I accidently put colons on the test data and remembered taking the
colon character out of the regex I was working on, but apparently
left it in, and accounted for the active entry indicator flag
which appears to have inconsistent support across vendors.
The regex has been fixed, and a test added from a Lenovo SR650
which has some additional string entry data in the UEFI output
which may separate entries.
Change-Id: I1f67b0fb1f645fa82e98bd7c7bba3ffc7755cc74
Diffstat (limited to 'ironic_python_agent/extensions')
| -rw-r--r-- | ironic_python_agent/extensions/image.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py index 4abb9c98..7ac1a4e3 100644 --- a/ironic_python_agent/extensions/image.py +++ b/ironic_python_agent/extensions/image.py @@ -277,7 +277,7 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition, original_efi_output = utils.execute('efibootmgr', '-v') # NOTE(TheJulia): regex used to identify entries in the efibootmgr # output on stdout. - entry_label = re.compile(r'Boot([0-9a-f-A-F]+):\s(.*).*$') + entry_label = re.compile(r'Boot([0-9a-f-A-F]+)\*?\s(.*).*$') label_id = 1 for v_bl in valid_efi_bootloaders: if 'csv' in v_bl.lower(): |