EFI for builder

install/cl_install.py

@@ -385,7 +385,7 @@ class Install(color_print):
                               target.getBootDirectory()),
                               "--target=x86_64-efi",
                               "--efi-directory=%s"%pathJoin(prefixBoot,
-                              path.join(target.getBootDirectory(),"efi")),
+                              target.getEfiDirectory()),
                               "-f"]
             if self.clVars.Get('os_install_root_type') == 'usb-hdd':
                 grubParams.append("--removable")

install/variables/distr.py

@@ -468,7 +468,7 @@ class VariableClTarget(ReadonlyVariable):
         if not systemId or mapDevId.get(disk,'') == systemId:
             systemId = None
         if osInstallScratch:
-            return ScratchPartitionDistributive(disk,mdirectory='/mnt/install',
+            target = ScratchPartitionDistributive(disk,mdirectory='/mnt/install',
                                     check=True,fileSystem=fileSystem,
                                     isFormat=self.isTrue(isFormat),
                                     systemId=systemId,

install/variables/system.py

@@ -74,7 +74,7 @@ class VariableOsInstallScratch(Variable):
             if self.Get('os_install_root_type') == "flash":
                 raise VariableError(
                     _("Flash install does not support the builder mode"))
-            if filter(lambda x: not x in ('/','swap'), 
+            if filter(lambda x: not x in ('/','swap','/boot/efi'), 
                       self.Get('os_install_disk_mount')):
                 raise VariableError(
                     _("The builder mode does not support "