[node-patches] Change in ovirt-node[master]: grub efi dir test

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: grub efi dir test
......................................................................

grub efi dir test

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


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

diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index 590c98f..34591ba 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -446,12 +446,17 @@
             shutil.rmtree(self.grub_dir)
         if not os.path.exists(self.grub_dir):
             os.makedirs(self.grub_dir)
-
             if _functions.is_efi_boot():
                 logger.info("efi detected, installing efi configuration")
                 _functions.system("mkdir /liveos/efi")
                 _functions.mount_efi()
-                efi_disk = re.sub("p[1,2,3]$", "", self.disk)
+                _functions.system("mkdir -p /liveos/efi/EFI/redhat")
+                _functions.system("cp /boot/efi/EFI/redhat/grub.efi " +
+                      "/liveos/efi/EFI/redhat/grub.efi")
+                if not "/dev/mapper/" in self.disk:
+                   efi_disk = self.disk[:-1]
+                else:
+                   efi_disk = re.sub("p[1,2,3]$", "", self.disk)
                 # generate grub legacy config for efi partition
                 #remove existing efi entries
                 _functions.remove_efi_entry(self.efi_dir_name)


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

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