The original solution broke the upgrade and it's one of reasons why
the upgrade has been inhibited for EFI boot. This should handle the
EFI boot during the upgrade, however manual actions after the upgrade
will be required regarding the Legacy Grub -> Grub2 migration.
After discussion with the bootlaoder team,
- drop the stuff around 'shim' rpm as secure boot is not supported
on RHEL 6
- EFI boot is relevant just on the intel architecture in case
of RHEL 6
Short summary of actions
- check whether EFI boot is used
- backup & restore Legacy Grub EFI files
- ensure the next boot is done to the correct partition
Note: the documentation is not updated yet, to inform about manual steps after the upgrade related to EFI. It will be prepared later in the mentioned document (see the solution text)