wic: make sure layout_partitions is called once
Removed artificial _partitions_layed_out attribute and unneeded call of layout_partitions method. (From OE-Core rev: 702772edc839c220140ac0572bb14b4e44c81c1c) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fd1f6fb201
commit
a9be5de4a1
|
@ -46,7 +46,6 @@ class Image():
|
|||
self.partimages = []
|
||||
# Size of a sector used in calculations
|
||||
self.sector_size = SECTOR_SIZE
|
||||
self._partitions_layed_out = False
|
||||
self.native_sysroot = native_sysroot
|
||||
|
||||
def _add_disk(self, disk_name):
|
||||
|
@ -58,8 +57,6 @@ class Image():
|
|||
# We already have this disk
|
||||
return
|
||||
|
||||
assert not self._partitions_layed_out
|
||||
|
||||
self.disks[disk_name] = \
|
||||
{'disk': None, # Disk object
|
||||
'numpart': 0, # Number of allocate partitions
|
||||
|
@ -90,8 +87,6 @@ class Image():
|
|||
# Converting kB to sectors for parted
|
||||
part.size_sec = part.disk_size * 1024 // self.sector_size
|
||||
|
||||
assert not self._partitions_layed_out
|
||||
|
||||
self.partitions.append(part)
|
||||
self._add_disk(part.disk)
|
||||
|
||||
|
@ -102,11 +97,6 @@ class Image():
|
|||
|
||||
msger.debug("Assigning %s partitions to disks" % ptable_format)
|
||||
|
||||
if self._partitions_layed_out:
|
||||
return
|
||||
|
||||
self._partitions_layed_out = True
|
||||
|
||||
# Go through partitions in the order they are added in .ks file
|
||||
for num in range(len(self.partitions)):
|
||||
part = self.partitions[num]
|
||||
|
@ -219,8 +209,6 @@ class Image():
|
|||
disk = self.disks[dev]
|
||||
disk['disk'].create()
|
||||
|
||||
self.layout_partitions()
|
||||
|
||||
for dev in self.disks:
|
||||
disk = self.disks[dev]
|
||||
msger.debug("Initializing partition table for %s" % \
|
||||
|
|
Loading…
Reference in New Issue