Merge pull request #53 from WenhuaChang/master

fix grub2-*-efi package not installed
yast · Mar 13, 2014 · 4b250c2 · 4b250c2
2 parents 66edf67 + 7a7fb80
commit 4b250c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 12 09:15:33 UTC 2014 - mchang@suse.com
+
+- fix grub2-*-efi package not installed (bnc#867380) 
+- 3.1.13
+
 -------------------------------------------------------------------
 Mon Mar 10 12:07:17 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.12
+Version:        3.1.13
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootGRUB2EFI.rb b/src/modules/BootGRUB2EFI.rb
@@ -101,11 +101,20 @@ def GetFunctions
 
     # Constructor
     def BootGRUB2EFI
+
+      if Arch.i386 
+        packages = ["grub2-i386-efi"]
+      elsif Arch.x86_64
+        packages = ["grub2-x86_64-efi", "shim"]
+      else
+        raise "no grub packages for EFI available for this architecture"
+      end
+
       Ops.set(
         BootCommon.bootloader_attribs,
         "grub2-efi",
         {
-          "required_packages" => ["grub2-efi", "shim"],
+          "required_packages" => packages,
           "loader_name"       => "GRUB2-EFI",
           "initializer"       => fun_ref(method(:Initializer), "void ()")
         }