From e2664f563921467fe38bb74f4dd2a41eb004ee9f Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Mon, 22 Dec 2014 15:28:02 +0100 Subject: wic: account for mmcblk device partition naming MMC block device partitions are named differently than other block devices and use the scheme: mmcblkp, ex: mmcblk0p1, mmcblk0p2. The current code generates incorrect parition names missing 'p' infix for fstab entries. The patch resolves this problem. Signed-off-by: Maciej Borzecki Signed-off-by: Maciek Borzecki Signed-off-by: Richard Purdie --- scripts/lib/wic/imager/direct.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 6b2ab3368e..b1dc3e96f4 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -100,10 +100,18 @@ class DirectImageCreator(BaseImageCreator): for num, p in enumerate(parts, 1): if not p.mountpoint or p.mountpoint == "/" or p.mountpoint == "/boot": continue - if self._ptable_format == 'msdos' and num > 3: - device_name = "/dev/" + p.disk + str(num + 1) - else: - device_name = "/dev/" + p.disk + str(num) + + part = '' + # mmc device partitions are named mmcblk0p1, mmcblk0p2.. + if p.disk.startswith('mmcblk'): + part = 'p' + + pnum = num + if self._ptable_format == 'msdos' and pnum > 3: + # account for logical partition numbering, ex. sda5.. + pnum += 1 + + device_name = "/dev/" + p.disk + part + str(pnum) opts = "defaults" if p.fsopts: -- cgit 1.2.3-korg