wic: include partition label in fs image file name

Not including the label image but having multiple partitions of the same
type, the image file of one partition would overwrite the other.

(From OE-Core rev: acf2fb7c6dfa3217ffcbf9483c190057d9f41bbf)

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maciej Borzecki 2014-07-21 13:01:57 +02:00 committed by Richard Purdie
parent 4ac5071e97
commit f12ac6101c
1 changed files with 3 additions and 3 deletions

View File

@ -385,7 +385,7 @@ class Wic_PartData(Mic_PartData):
"""
Prepare an empty ext2/3/4 partition.
"""
fs = "%s/fs.%s" % (cr_workdir, self.fstype)
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
dd_cmd = "dd if=/dev/zero of=%s bs=1M seek=%d count=0" % \
(fs, self.size)
@ -405,7 +405,7 @@ class Wic_PartData(Mic_PartData):
"""
Prepare an empty btrfs partition.
"""
fs = "%s/fs.%s" % (cr_workdir, self.fstype)
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
dd_cmd = "dd if=/dev/zero of=%s bs=1M seek=%d count=0" % \
(fs, self.size)
@ -426,7 +426,7 @@ class Wic_PartData(Mic_PartData):
"""
Prepare an empty vfat partition.
"""
fs = "%s/fs.%s" % (cr_workdir, self.fstype)
fs = "%s/fs_%s.%s" % (cr_workdir, self.label, self.fstype)
blocks = self.size * 1024