From: Maciej Borzecki Date: Mon, 21 Jul 2014 11:01:57 +0000 (+0200) Subject: wic: include partition label in fs image file name X-Git-Tag: 2015-4~1904 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=acf2fb7c6dfa3217ffcbf9483c190057d9f41bbf;p=openembedded-core.git 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. Signed-off-by: Maciej Borzecki Signed-off-by: Maciek Borzecki Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index a3d5ef35c7..abf3498134 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py @@ -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