53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From 4ff9d909fa1330cad6f6dfde08795509b3db036d Mon Sep 17 00:00:00 2001
|
|
From: Petr Stodulka <pstodulk@redhat.com>
|
|
Date: Thu, 16 Jul 2020 12:21:00 +0200
|
|
Subject: [PATCH] Fix paths of legacy grub config file on EFI system
|
|
|
|
---
|
|
boom-0.8/boom/legacy.py | 2 ++
|
|
redhat_upgrade_tool/__init__.py | 2 ++
|
|
redhat_upgrade_tool/rollback/bootloader.py | 2 ++
|
|
3 files changed, 6 insertions(+)
|
|
|
|
diff --git a/boom-0.8/boom/legacy.py b/boom-0.8/boom/legacy.py
|
|
index 0d765d8..bedf219 100644
|
|
--- a/boom-0.8/boom/legacy.py
|
|
+++ b/boom-0.8/boom/legacy.py
|
|
@@ -36,6 +36,8 @@ BOOM_LEGACY_END_FMT="#--- BOOM_%s_END ---"
|
|
#: Constants for legacy boot loaders supported by boom
|
|
BOOM_LOADER_GRUB1="grub1"
|
|
BOOM_GRUB1_CFG_PATH="grub/grub.conf"
|
|
+if not path_exists(path_join("/boot/", BOOM_GRUB1_CFG_PATH)):
|
|
+ BOOM_GRUB1_CFG_PATH="efi/EFI/redhat/grub.conf"
|
|
|
|
# Module logging configuration
|
|
_log = logging.getLogger(__name__)
|
|
diff --git a/redhat_upgrade_tool/__init__.py b/redhat_upgrade_tool/__init__.py
|
|
index 6976647..1e0b1b3 100644
|
|
--- a/redhat_upgrade_tool/__init__.py
|
|
+++ b/redhat_upgrade_tool/__init__.py
|
|
@@ -68,5 +68,7 @@ preupgrade_dir = "/root/preupgrade"
|
|
preupgrade_script_path = os.path.join(preupgrade_dir, 'preupgrade-scripts')
|
|
release_version_file = os.path.join(preupgrade_dir, preupgrade_script_path, 'release_version')
|
|
grub_conf_file = "/boot/grub/grub.conf"
|
|
+if not os.path.exists(grub_conf_file):
|
|
+ grub_conf_file = "/boot/efi/EFI/redhat/grub.conf"
|
|
|
|
MIN_AVAIL_BYTES_FOR_BOOT = 50 * 2**20 # 50 MiB
|
|
diff --git a/redhat_upgrade_tool/rollback/bootloader.py b/redhat_upgrade_tool/rollback/bootloader.py
|
|
index 13d8f18..f0c384a 100644
|
|
--- a/redhat_upgrade_tool/rollback/bootloader.py
|
|
+++ b/redhat_upgrade_tool/rollback/bootloader.py
|
|
@@ -14,6 +14,8 @@ try:
|
|
from redhat_upgrade_tool.util import check_call
|
|
except ImportError:
|
|
grub_conf_file = "/boot/grub/grub.conf"
|
|
+ if not os.path.exists(grub_conf_file):
|
|
+ grub_conf_file = "/boot/efi/EFI/redhat/grub.conf"
|
|
|
|
def check_call(*popenargs, **kwargs):
|
|
retcode = call(*popenargs, **kwargs)
|
|
--
|
|
2.25.4
|
|
|