Fix dos autopart, usb-hdd uefi install

install/variables/autopartition.py

@@ -673,7 +673,9 @@ class VariableClAutopartitionDiskDev(ReadonlyVariable,AutopartitionHelper):
         for line in self.deviceOpts(scheme):
             # for dos 4 - extension
             # for gpt 4 - for bios_boot
-            if number == 4 and self.Get('cl_autopartition_bios_grub_set')=='on':
+            if number == 4 and (
+                self.Get('cl_autopartition_bios_grub_set')=='on' or
+                dos):
                 number += 1
             yield "%s%d"%(devices[0],number)
             number += 1

install/variables/disk.py

@@ -810,7 +810,7 @@ class VariableOsLocationDest(LocationHelper,Variable):
     def choice(self):
         if self.Get('cl_install_type') == 'flash': return ["/",""]
         else: return ['/','/boot','/var/calculate','/home',
-                      '/usr','/var','/tmp','swap','']
+                      '/usr','/var','/tmp','swap','/boot/efi','']
 
     def check(self,value):
         """Check set location source"""

install/variables/system.py

@@ -599,7 +599,8 @@ class VariableOsInstallUefiSet(Variable):
 
     def check(self,value):
         if value == 'on':
-            if self.Get('os_uefi_set') == 'off':
+            if self.Get('os_uefi_set') == 'off' and \
+                self.Get('os_install_root_type') == 'hdd':
                 raise VariableError(
                   _("System must be loaded in UEFI for using this bootloader"))
             if not 'gpt' in self.Get('os_device_table'):