[node-patches] Change in ovirt-node[ovirt-3.6]: Bring back EFI support

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: Bring back EFI support
......................................................................

Bring back EFI support

Don't remove the EFI boot files (the ISO was still being built
with an EFI section, and all other support is still present)

Correct self.path to self.efi_path in ovirtnode.install

Change-Id: I7359c9fda834d85eafcca52f248e511302b8ff36
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-efi.ks.in
M src/ovirtnode/install.py
2 files changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/11/52711/1

diff --git a/recipe/common-efi.ks.in b/recipe/common-efi.ks.in
index fa33ac0..d52eeb7 100644
--- a/recipe/common-efi.ks.in
+++ b/recipe/common-efi.ks.in
@@ -75,11 +75,3 @@
 EOF
 fi
 cp $LIVE_ROOT/EFI/BOOT/BOOTX64.conf $LIVE_ROOT/EFI/BOOT/grub.cfg
-
-
-#
-# EFI support was dropped on RHEV-H:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1227752
-# And it is now removed from the ISO to save space
-#
-rm -rvf "$LIVE_ROOT/EFI/" "$LIVE_ROOT/isolinux/efiboot.img"
diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index 743bab7..f92912b 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -349,7 +349,7 @@
             if "OVIRT_ISCSI_INSTALL" in OVIRT_VARS:
                 _functions.system("umount /boot")
             if os.path.isfile("/boot/efi/%s/grubx64.efi" % self.efi_path):
-                shutil.copy("/boot/efi/%s/grubx64.efi" % self.path, "/tmp")
+                shutil.copy("/boot/efi/%s/grubx64.efi" % self.efi_path, "/tmp")
             else:
                 shutil.copy("/boot/efi/%s/grub.efi" % self.efi_path, "/tmp")
             _functions.mount_boot()


-- 
To view, visit https://gerrit.ovirt.org/52711
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7359c9fda834d85eafcca52f248e511302b8ff36
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>