[node-patches] Change in ovirt-node[master]: Set grub_config_file with legacy grub install

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: Set grub_config_file with legacy grub install
......................................................................

Set grub_config_file with legacy grub install

rhbz#916514

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/90/12890/1

diff --git a/scripts/ovirtnode/install.py b/scripts/ovirtnode/install.py
index e9ce728..d78ba1b 100755
--- a/scripts/ovirtnode/install.py
+++ b/scripts/ovirtnode/install.py
@@ -84,13 +84,16 @@
             self.grub_prefix = self.grub_prefix + "2"
             self.grub_dir = self.grub_dir + "2"
             self.grub_config_file = "%s/grub.cfg" % 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
+        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
 
     def grub_install(self):
         if _functions.is_iscsi_install():


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

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