From e756ee57be43ba69ff26dadd1bad18857c909dff Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Thu, 28 Mar 2013 10:46:11 +0400
Subject: [PATCH] EFI for builder

---
 install/cl_install.py       |  2 +-
 install/variables/distr.py  | 58 ++++++++++++++++++-------------------
 install/variables/system.py |  2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/install/cl_install.py b/install/cl_install.py
index 867ed11..1511234 100644
--- a/install/cl_install.py
+++ b/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")
diff --git a/install/variables/distr.py b/install/variables/distr.py
index 282ac30..5e92c5f 100644
--- a/install/variables/distr.py
+++ b/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,
@@ -487,34 +487,34 @@ class VariableClTarget(ReadonlyVariable):
                                     isFormat=self.isTrue(isFormat),
                                     systemId=systemId,
                                     partitionTable=partTable)
-            multiPartition = None
-            diskData = self.Select(listVars,
-                                   where='os_install_disk_mount',
-                                   ne='/')
-            bindData = self.Select(['os_install_bind_path',
-                                    'os_install_bind_mountpoint'],
-                                    where='os_install_bind_mountpoint',
-                                    ne='')
-            if diskData or bindData:
-                multiPartition = MultiPartitions()
-                target.multipartition = multiPartition
-            for disk,mount,fileSystem,isFormat,partTable,systemId in diskData:
-                if not systemId or mapDevId.get(disk,'') == systemId:
-                    systemId = None
-                multiPartition.addPartition(dev=disk,
-                    mountPoint=mount,
-                    fileSystem=fileSystem,
-                    isFormat=self.isTrue(isFormat),
-                    systemId=systemId,
-                    partitionTable=partTable)
-            for source,dest in bindData:
-                multiPartition.addPartition(dev=source,
-                    mountPoint=dest,
-                    fileSystem='bind',
-                    isFormat=False,
-                    systemId=None,
-                    partitionTable='')
-            return target
+        multiPartition = None
+        diskData = self.Select(listVars,
+                               where='os_install_disk_mount',
+                               ne='/')
+        bindData = self.Select(['os_install_bind_path',
+                                'os_install_bind_mountpoint'],
+                                where='os_install_bind_mountpoint',
+                                ne='')
+        if diskData or bindData:
+            multiPartition = MultiPartitions()
+            target.multipartition = multiPartition
+        for disk,mount,fileSystem,isFormat,partTable,systemId in diskData:
+            if not systemId or mapDevId.get(disk,'') == systemId:
+                systemId = None
+            multiPartition.addPartition(dev=disk,
+                mountPoint=mount,
+                fileSystem=fileSystem,
+                isFormat=self.isTrue(isFormat),
+                systemId=systemId,
+                partitionTable=partTable)
+        for source,dest in bindData:
+            multiPartition.addPartition(dev=source,
+                mountPoint=dest,
+                fileSystem='bind',
+                isFormat=False,
+                systemId=None,
+                partitionTable='')
+        return target
 
 class VariableClImageNewOnly(Variable):
     """
diff --git a/install/variables/system.py b/install/variables/system.py
index 9b710ed..9f95335 100644
--- a/install/variables/system.py
+++ b/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 "