[OE-core] [OE-code][PATCH] wic: include partition label in fs image file name

[Tom Zanussi]

On Mon, 2014-07-21 at 13:01 +0200, Maciej Borzecki wrote:
> Not including the label image but having multiple partitions of the same
> type, the image file of one partition would overwrite the other.
> 

Right, the empty-partition case somehow missed the label - good catch.

Acked-by: Tom Zanussi <tom.zanussi at linux.intel.com>

> Signed-off-by: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
> Signed-off-by: Maciek Borzecki <maciek.borzecki at gmail.com>
> ---
>  scripts/lib/mic/kickstart/custom_commands/partition.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
> index 06f29a9..d0f1b78 100644
> --- a/scripts/lib/mic/kickstart/custom_commands/partition.py
> +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
> @@ -343,7 +343,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)
> @@ -363,7 +363,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)
> @@ -384,7 +384,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
>