Fix install grub and mbr

install/cl_install.py

@@ -383,8 +383,8 @@ class Install(color_print):
         if self.clVars.GetBool('os_install_uefi_set'):
             grubParams = ["--boot-directory=%s"%pathJoin(prefixBoot,
                               target.getBootDirectory()),
-                              "--efi-directory=%s"%pathJoin(prefixBoot,
                               "--target=x86_64-efi",
+                              "--efi-directory=%s"%pathJoin(prefixBoot,
                               path.join(target.getBootDirectory(),"efi")),
                               "-f"]
             if self.clVars.Get('os_install_root_type') == 'usb-hdd':

install/variables/disk.py

@@ -1689,7 +1689,7 @@ class VariableOsInstallMbr(LocationHelper,Variable):
                 if tableOnBootDisk == "gpt":
                     raise VariableError(_("You need a disk with a dos "
                                           "table for Flash install"))
-            if rootType == "hdd" and tableOnBootDisk == "gpt":
+            if rootType in ("usb-hdd","hdd") and tableOnBootDisk == "gpt":
                 bios_grub = self.Select('os_disk_parent',
                                         where='os_disk_id',eq='EF02')
                 if not mbrDisk in bios_grub: