diff options
| author | Iury Gregory Melo Ferreira <imelofer@redhat.com> | 2019-12-02 16:56:42 +0100 |
|---|---|---|
| committer | Iury Gregory Melo Ferreira <imelofer@redhat.com> | 2020-01-16 11:23:41 +0100 |
| commit | b6210be196fea271b2c49f89d3e1638517c1198c (patch) | |
| tree | 27e8dfd35248a8ece8d7bcffdd9b12f4a03018f8 /ironic_python_agent/utils.py | |
| parent | 1b20dd9b96c9b73e45618fc88bfddfe82652d203 (diff) | |
| download | ironic-python-agent-b6210be196fea271b2c49f89d3e1638517c1198c.tar.gz | |
Avoid grub2-install when on UEFI boot mode
This patch changes the workflow for whole disk images when using uefi.
If we can identify the bootloader and it's valid we can update using
efibootmgr since grub2-install have problems specially on secure boot
mode.
We also updated the regex to search for the uefi partition on the disk,
since in some cases the parted command output can be without the FS
for the partition with esp Flag.
Change-Id: I7167e71e5d2352a045565289b200e5530d0ba11d
Story: #2006847
Task: #37435
Diffstat (limited to 'ironic_python_agent/utils.py')
| -rw-r--r-- | ironic_python_agent/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic_python_agent/utils.py b/ironic_python_agent/utils.py index d3eb08bd..5f1c0dc2 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -68,7 +68,7 @@ COLLECT_LOGS_COMMANDS = { DEVICE_EXTRACTOR = re.compile(r'^(?:(.*\d)p|(.*\D))(?:\d+)$') -PARTED_ESP_PATTERN = re.compile(r'^\s*(\d+)\s.*\sfat\d*\s.*esp(,|\s|$).*$') +PARTED_ESP_PATTERN = re.compile(r'^\s*(\d+)\s.*\s\s.*\s.*esp(,|\s|$).*$') def execute(*cmd, **kwargs): |