Fix migrate location point on build mode

install/variables/disk.py

@@ -641,11 +641,17 @@ class VariableOsLocationSource(LocationHelper,DeviceHelper,Variable):
                 return self.Get('os_disk_dev')+self.Get('os_bind_path')
             else:
                 devFrom = self.Get('os_install_dev_from')
-                return self.Select('os_disk_dev',
-                                   where='os_disk_mount',
-                                   func=lambda x:not x[0] in ("","/") or 
-                                                 x[1] == devFrom) + \
-                        self.Get('os_bind_path')
+                if self.Get('os_install_scratch') == 'on':
+                    return self.Select('os_disk_dev',
+                                       where='os_disk_mount',
+                                       func=lambda x:x[0] == "swap" or 
+                                                     x[1] == devFrom)
+                else:
+                    return self.Select('os_disk_dev',
+                                       where='os_disk_mount',
+                                       func=lambda x:not x[0] in ("","/") or 
+                                                     x[1] == devFrom) + \
+                            self.Get('os_bind_path')
 
     def get(self):
         if self.Get('cl_autopartition_set') == "on":