From 3a95c4549f743aa47456c76e687a863c64c7a7f4 Mon Sep 17 00:00:00 2001 From: João Henrique Ferreira de Freitas Date: Sat, 22 Mar 2014 19:41:36 -0300 Subject: wic: Add SD/MMC-Cards support to '--ondisk' param MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The special case when wic is set up to use SD/MMC-Cards in place of sdX disks is not handled properly. Append 'p' to the rootdev when disk is SD/MMC-Cards fix this situation. Signed-off-by: João Henrique Ferreira de Freitas Signed-off-by: Richard Purdie --- scripts/lib/mic/imager/direct.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index f8c300c787..1f2f8fcf9c 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py @@ -345,10 +345,14 @@ class DirectImageCreator(BaseImageCreator): parts = self._get_parts() for num, p in enumerate(parts, 1): if p.mountpoint == "/": + part = '' + if p.disk.startswith('mmcblk'): + part = 'p' + if self._ptable_format == 'msdos' and num > 3: - rootdev = "/dev/%s%-d" % (p.disk, num + 1) + rootdev = "/dev/%s%s%-d" % (p.disk, part, num + 1) else: - rootdev = "/dev/%s%-d" % (p.disk, num) + rootdev = "/dev/%s%s%-d" % (p.disk, part, num) root_part_uuid = p.part_type return (rootdev, root_part_uuid) -- cgit 1.2.3-korg