From 333ed70c94e366f16d8f2633f74a5ef05aa5fadb Mon Sep 17 00:00:00 2001 From: Arne Wiebalck Date: Fri, 8 Oct 2021 08:11:48 +0200 Subject: [PATCH] Assert EFI part UUID is not None before editing fstab The EFI partition UUID may be None and this will break the fstab editing. While this is not necessarily fatal when instantiating a node, it creates an exception at the end of bootloader installation, so only attempt to add a line to fstab when the UUID is not None. Change-Id: I68799980e67c05afe4ca68ca9733605dd166d54d --- ironic_python_agent/extensions/image.py | 2 +- releasenotes/notes/fix_efi_uuid_fstab-f2edbee9bfbac64a.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix_efi_uuid_fstab-f2edbee9bfbac64a.yaml diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py index 1d439923f..a09cb140e 100644 --- a/ironic_python_agent/extensions/image.py +++ b/ironic_python_agent/extensions/image.py @@ -760,7 +760,7 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None, # recommended path. _configure_grub(device, path) - if efi_mounted: + if efi_system_part_uuid and efi_mounted: _append_uefi_to_fstab(path, efi_system_part_uuid) LOG.info("GRUB2 successfully installed on %s", device) diff --git a/releasenotes/notes/fix_efi_uuid_fstab-f2edbee9bfbac64a.yaml b/releasenotes/notes/fix_efi_uuid_fstab-f2edbee9bfbac64a.yaml new file mode 100644 index 000000000..77d64ce08 --- /dev/null +++ b/releasenotes/notes/fix_efi_uuid_fstab-f2edbee9bfbac64a.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue when the EFI partition UUID is not set and an attempt + to edit /etc/fstab is made. +