[oe-commits] Maciej Borzecki : wic: include partition label in fs image file name
git at git.openembedded.org
git at git.openembedded.org
Fri Aug 15 17:22:26 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: acf2fb7c6dfa3217ffcbf9483c190057d9f41bbf
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=acf2fb7c6dfa3217ffcbf9483c190057d9f41bbf
Author: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Date: Mon Jul 21 13:01:57 2014 +0200
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 at open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/lib/wic/kickstart/custom_commands/partition.py | 6 +++---
1 file 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 a3d5ef3..abf3498 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
More information about the Openembedded-commits
mailing list