From c7efb3a21618ce3069811042279a0d898237ac0f Mon Sep 17 00:00:00 2001 From: João Henrique Ferreira de Freitas Date: Sat, 29 Mar 2014 00:12:05 -0300 Subject: wic: Use partition label to be part of rootfs filename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a partition from .wks file is set up like this: part /standby --source rootfs --rootfs-dir= ... --label \ --label secondary This means that 'rootfs' must use '' as rootfs and the default partition filename in /var/tmp/wic/build/ will be create using the '--label' as part of the name. E.g: /var/tmp/wic/build/rootfs_secondary.ext3 Signed-off-by: João Henrique Ferreira de Freitas Signed-off-by: Richard Purdie --- scripts/lib/mic/kickstart/custom_commands/partition.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py index c3bb9a5b86..8973edc110 100644 --- a/scripts/lib/mic/kickstart/custom_commands/partition.py +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py @@ -172,7 +172,7 @@ class Wic_PartData(Mic_PartData): """ image_rootfs = rootfs_dir - rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype) + rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype) du_cmd = "du -ks %s" % image_rootfs rc, out = exec_cmd(du_cmd) @@ -217,7 +217,7 @@ class Wic_PartData(Mic_PartData): Currently handles ext2/3/4 and btrfs. """ image_rootfs = rootfs_dir - rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype) + rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype) du_cmd = "du -ks %s" % image_rootfs rc, out = exec_cmd(du_cmd) -- cgit 1.2.3-korg