[node-patches] Change in ovirt-node[master]: fix efi directory name and remove unnecessary grub-efi packa...

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: fix efi directory name and remove unnecessary grub-efi package
......................................................................

fix efi directory name and remove unnecessary grub-efi package

Signed-off-by: Joey Boggs <jboggs at redhat.com>
Change-Id: I0395fd8f1d24702f6d2cf292a6f03dd0114bfbda
---
M recipe/ovirt18-pkgs.ks
M src/ovirtnode/install.py
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/10/16310/1

diff --git a/recipe/ovirt18-pkgs.ks b/recipe/ovirt18-pkgs.ks
index 3e42e8c..ab2f5e1 100644
--- a/recipe/ovirt18-pkgs.ks
+++ b/recipe/ovirt18-pkgs.ks
@@ -1,5 +1,4 @@
 %include fedora-pkgs.ks
-grub-efi
 grub2-efi
 firewalld
 selinux-policy-devel
diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index b7f4907..5552f36 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -41,6 +41,7 @@
         self.partN = -1
         self.s = Storage()
         self.efi_hd = ""
+        self.efi_dir_name = "redhat"
 
     def kernel_image_copy(self):
         if (not _functions.system("cp -p /live/" + self.syslinux + \
@@ -88,10 +89,6 @@
         else:
             self.grub_config_file = "%s/grub.conf" % self.grub_dir
 
-        if os.path.exists("/boot/efi/EFI/fedora"):
-            self.efi_dir_name = "fedora"
-        else:
-            self.efi_dir_name = "redhat"
         if _functions.is_efi_boot():
             self.grub_config_file = "/liveos/efi/EFI/%s/grub.cfg" \
                                      % self.efi_dir_name


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

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