aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMaciej Borzecki <maciej.borzecki@open-rnd.pl>2014-07-21 13:01:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:19:56 +0100
commitacf2fb7c6dfa3217ffcbf9483c190057d9f41bbf (patch)
treef7dbd54b3ebb0f7f41e33e15ff74669b0eaa1d5f /scripts
parent3bdc225a9e622e9d594944833964fe396200db01 (diff)
downloadopenembedded-core-contrib-acf2fb7c6dfa3217ffcbf9483c190057d9f41bbf.tar.gz
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 <maciej.borzecki@open-rnd.pl> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/partition.py6
1 files changed, 3 insertions, 3 deletions
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