- bnc#884831 - uefi Xen bootloader is not automatically inserted

  as an efi boot option
- 3.1.15

package/yast2-vm.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul  9 15:02:28 MDT 2014 - carnold@suse.com
+
+- bnc#884831 - uefi Xen bootloader is not automatically inserted
+  as an efi boot option 
+- 3.1.15
+
 -------------------------------------------------------------------
 Wed Jul  2 17:02:00 MDT 2014 - carnold@suse.com
 

package/yast2-vm.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-vm
-Version:        3.1.14
+Version:        3.1.15
 Release:        0
 Group:		System/YaST
 

src/modules/VM_XEN.rb

@@ -45,6 +45,7 @@ def main
       Yast.import "Wizard"
       Yast.import "Label"
       Yast.import "Bootloader"
+      Yast.import "BootCommon"
       Yast.import "Lan"
 
 
@@ -457,8 +458,15 @@ def LXCDialog
       # If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
       if install_xen
         Builtins.y2milestone("Checking for bootloader type")
-        if Bootloader.getLoaderType == "grub2"
+        if Bootloader.getLoaderType == "grub2" || Bootloader.getLoaderType == "grub2-efi"
           Progress.Title(_("Updating grub2 configuration files..."))
+
+          # To force and EFI update
+          BootCommon.location_changed = true
+          old_progress = Progress.set(false)
+          Bootloader.Write
+          Progress.set(old_progress)
+
           cmd = "/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg"
           Builtins.y2milestone("Executing: %1", cmd)
           SCR.Execute(path(".target.bash"), cmd)