[node-patches] Change in ovirt-node[master]: efi upgrade needs to mount_efi

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: efi upgrade needs to mount_efi
......................................................................

efi upgrade needs to mount_efi

rhbz#880030

Change-Id: I3fd0766301b74f6003841183153a9dd00c4389ed
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirtnode/install.py
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/27/9527/1

diff --git a/scripts/ovirtnode/install.py b/scripts/ovirtnode/install.py
index 2490704..b75dfce 100755
--- a/scripts/ovirtnode/install.py
+++ b/scripts/ovirtnode/install.py
@@ -253,7 +253,10 @@
                 return True
         self.oldtitle=None
         grub_config_file = None
+        _functions.mount_liveos()
         if os.path.ismount("/liveos"):
+            if _functions.is_efi_boot():
+                _functions.mount_efi()
             if os.path.exists("/liveos/vmlinuz0") and os.path.exists("/liveos/initrd0.img"):
                 grub_config_file = self.grub_config_file
 
@@ -266,15 +269,15 @@
                 mount_liveos()
                 grub_config_file = "/liveos/grub/grub.conf"
 
-        if not grub_config_file is None:
+        if not grub_config_file is None and os.path.exists(grub_config_file):
             f=open(grub_config_file)
             oldgrub=f.read()
             f.close()
             m=re.search("^title (.*)$", oldgrub, re.MULTILINE)
             if m is not None:
                 self.oldtitle=m.group(1)
+        _functions.system("umount /liveos/efi")
         _functions.system("umount /liveos")
-
         if _functions.findfs("BootBackup"):
             self.boot_candidate = "BootBackup"
         elif _functions.findfs("Boot"):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fd0766301b74f6003841183153a9dd00c4389ed
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>