From e8f0a651bf7f905f85273fc151f2fd23199900a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.com>
Date: Mon, 25 Jan 2016 22:05:07 +0100
Subject: [PATCH] More modules not present for grub2/x86_64-xen

---
 kiwi/bootloader_config_grub2.py           | 26 ++++++++++++++---------
 test/unit/bootloader_config_grub2_test.py |  3 +--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/kiwi/bootloader_config_grub2.py b/kiwi/bootloader_config_grub2.py
index a780758d..3fadfe3e 100644
--- a/kiwi/bootloader_config_grub2.py
+++ b/kiwi/bootloader_config_grub2.py
@@ -412,23 +412,29 @@ class BootLoaderConfigGrub2(BootLoaderConfigBase):
 
     def __get_efi_modules(self):
         modules = self.__get_basic_modules() + [
-            'part_gpt',
-            'efi_gop',
-            'efi_uga',
-            'linuxefi'
+            'part_gpt'
         ]
+        if not self.firmware.ec2_mode():
+            modules += [
+                'efi_gop',
+                'efi_uga',
+                'linuxefi'
+            ]
         return modules
 
     def __get_bios_modules(self):
         modules = self.__get_basic_modules() + [
             'part_gpt',
-            'part_msdos',
-            'biosdisk',
-            'vga',
-            'vbe',
-            'chain',
-            'boot'
+            'part_msdos'
         ]
+        if not self.firmware.ec2_mode():
+            modules += [
+                'biosdisk',
+                'vga',
+                'vbe',
+                'chain',
+                'boot'
+            ]
         return modules
 
     def __get_efi_image_name(self):
diff --git a/test/unit/bootloader_config_grub2_test.py b/test/unit/bootloader_config_grub2_test.py
index dadf1e71..57c328d9 100644
--- a/test/unit/bootloader_config_grub2_test.py
+++ b/test/unit/bootloader_config_grub2_test.py
@@ -341,8 +341,7 @@ class TestBootLoaderConfigGrub2(object):
                 'ls', 'normal', 'gzio', 'png', 'fat', 'gettext', 'font',
                 'minicmd', 'gfxterm', 'gfxmenu', 'video', 'video_fb',
                 'xfs', 'btrfs', 'lvm', 'part_gpt',
-                'part_msdos', 'biosdisk', 'vga', 'vbe', 'chain',
-                'boot'
+                'part_msdos'
             ])
         ]