More modules not present for grub2/x86_64-xen

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):

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'
             ])
         ]