diff options
| author |   Maciej Borzecki <maciej.borzecki@open-rnd.pl> | 2014-12-22 15:28:02 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-25 08:18:13 +0000 |
| commit | 052c67c8450fb1d9e0a10d7c60b23727c3830b24 (patch) | |
| tree | e54b4488eedde08c5e1b395df444b5eadd63dc13 /scripts/lib/wic/imager/direct.py | |
| parent | 51374d55ef64689f393dc0aeb1943086ac0bc6b6 (diff) | |
| download | openembedded-core-contrib-052c67c8450fb1d9e0a10d7c60b23727c3830b24.tar.gz | |
wic: account for mmcblk device partition naming
MMC block device partitions are named differently than other block
devices and use the scheme: mmcblk<devnum>p<partnum>, ex: mmcblk0p1,
mmcblk0p2. The current code generates incorrect parition names missing
'p' infix for fstab entries. The patch resolves this problem.
(From OE-Core rev: e2664f563921467fe38bb74f4dd2a41eb004ee9f)
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/lib/wic/imager/direct.py')
| -rw-r--r-- | scripts/lib/wic/imager/direct.py | 16 |
1 files 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: |