[node-patches] Change in ovirt-node[master]: find_grub_cfg(): Add elif statement to get correct cfg_path ...

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: find_grub_cfg(): Add elif statement to get correct cfg_path for efi_boot
......................................................................

find_grub_cfg(): Add elif statement to get correct cfg_path for efi_boot

Change-Id: I299fb4906d8d2e947130daea1de570a9347bb202
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1046887
Signed-off-by: hadong <hadong at redhat.com>
---
M src/ovirt/node/utils/system.py
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/18/26418/1

diff --git a/src/ovirt/node/utils/system.py b/src/ovirt/node/utils/system.py
index 4786e5e..499a467 100644
--- a/src/ovirt/node/utils/system.py
+++ b/src/ovirt/node/utils/system.py
@@ -740,9 +740,15 @@
     @staticmethod
     def find_grub_cfg():
         cfg_path = None
-
+        import ovirtnode.ovirtfunctions as _functions
         if Filesystem.by_label("Boot"):
             cfg_path = "/boot/grub/grub.conf"
+        elif _functions.is_efi_boot():
+            _functions.mount_efi(target="/liveos")
+            if os.path.exists("/liveos/EFI/redhat"):
+                cfg_path = "/liveos/EFI/redhat/grub.conf"
+            else:
+                cfg_path = "/liveos/EFI/fedora/grub.cfg"
         elif os.path.ismount("/dev/.initramfs/live"):
             if not Bootloader.is_grub2():
                 cfg_path = "/dev/.initramfs/live/grub/grub.conf"


-- 
To view, visit http://gerrit.ovirt.org/26418
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I299fb4906d8d2e947130daea1de570a9347bb202
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>