[node-patches] Change in ovirt-node[master]: only umount /liveos for efi installs to read grub.conf for u...

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: only umount /liveos for efi installs to read grub.conf for upgrades
......................................................................

only umount /liveos for efi installs to read grub.conf for upgrades

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/66/11866/1

diff --git a/scripts/ovirtnode/install.py b/scripts/ovirtnode/install.py
index 9ae2f73..f07c2c4 100755
--- a/scripts/ovirtnode/install.py
+++ b/scripts/ovirtnode/install.py
@@ -159,6 +159,12 @@
         grub_conf.close()
         # splashscreen
         _functions.system("cp /live/EFI/BOOT/splash.xpm.gz /liveos/grub")
+        # usb devices requires default BOOTX64 entries
+        if _functions.is_efi_boot():
+            _functions.system("mkdir -p /liveos/efi/EFI/BOOT")
+            _functions.system("cp /boot/efi/EFI/redhat/grub.efi /liveos/efi/EFI/BOOT/BOOTX64.efi")
+            _functions.system("cp /liveos/efi/EFI/redhat/grub.conf /liveos/efi/EFI/BOOT/BOOTX64.conf")
+            _functions.system("umount /liveos/efi")
         if not _functions.is_efi_boot():
             for f in ["stage1", "stage2", "e2fs_stage1_5"]:
                 _functions.system("cp /usr/share/grub/x86_64-redhat/%s %s" % \
@@ -278,10 +284,10 @@
             if is_upgrade():
                 mount_liveos()
                 grub_config_file = "/liveos/grub/grub.conf"
-        _functions.system("umount /liveos")
         if _functions.is_efi_boot():
-            mount_efi(target="/liveos")
             logger.debug(str(os.listdir("/liveos")))
+            _functions.system("umount /liveos")
+            _functions.mount_efi(target="/liveos")
             grub_config_file = "/liveos/EFI/%s/grub.cfg" % self.efi_dir_name
         grub_config_file_exists = grub_config_file is not None and os.path.exists(grub_config_file)
         logger.debug("Grub config file is: %s" % grub_config_file)


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

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