diff options
| author |   Henning Schild <henning.schild@siemens.com> | 2022-04-22 11:44:48 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-04-29 05:27:54 -1000 |
| commit | 354ef6b723f50b5f0b46a2bf5797e5b982c6ea73 (patch) | |
| tree | 0bc9dfbf577ffe4f3727280391cc1197ee9ac55d /scripts | |
| parent | 34a710cc8ebb18bb8443d635e06fefb7f6a003c2 (diff) | |
| download | openembedded-core-contrib-354ef6b723f50b5f0b46a2bf5797e5b982c6ea73.tar.gz | |
wic: do not use PARTLABEL for msdos partition tables
When using "msdos" partition tables and "--label" but not "--use-uuid"
one can generate images which will not find their root, because
PARTLABEL does not work for "msdos".
Fix that by simply not going the PARTLABEL path in case of "msdos".
Fixes: 2fb247c5ecf0 ("wic: support rootdev identified by partition label")
Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9ea1a838b946020e026edc032039552b723fcaa4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 35fff7c102..4d0b836ef6 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -259,7 +259,7 @@ class DirectPlugin(ImagerPlugin): if part.mountpoint == "/": if part.uuid: return "PARTUUID=%s" % part.uuid - elif part.label: + elif part.label and self.ptable_format != 'msdos': return "PARTLABEL=%s" % part.label else: suffix = 'p' if part.disk.startswith('mmcblk') else '' |