Skip to contentSkip to conversation

wic/bootimg-efi: replace hardcoded volume name with label

PATCH In review [email protected] 2 participants 2 messages May 13, 2019 – May 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 wic/bootimg-efi: replace hardcoded volume name with label

From: Chee Yang Lee <[email protected]>

volume name should refer to --label in .wks. Replace the hardcoded volume name with label. set "ESP" as default name when no lable specified.

---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/lib/wic/plugins/source/bootimg-efi.py +4 -2
index a7d513c..9b324d3 100644
@@ -254,8 +254,10 @@ class BootimgEFIPlugin(SourcePlugin):
         # dosfs image, created by mkdosfs
         bootimg = "%s/boot.img" % cr_workdir
 
-        dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \
-                    (part.fsuuid, bootimg, blocks)
+        label = part.label if part.label else "ESP"
+
+        dosfs_cmd = "mkdosfs -n %s -i %s -C %s %d" % \
+                    (label, part.fsuuid, bootimg, blocks)
         exec_native_cmd(dosfs_cmd, native_sysroot)
 
         mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)
Signature · 1 line
2.7.4