]> code.ossystems Code Review - openembedded-core.git/commitdiff
isoimage-isohybrid.py: Parameterize ESP label
authorHaris Okanovic <haris.okanovic@ni.com>
Thu, 7 Nov 2019 18:51:15 +0000 (12:51 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 10 Nov 2019 14:04:55 +0000 (14:04 +0000)
Add "esp_label" plugin parameter so that caller may override default
ESP partition label 'EFIimg'.

Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/wic/plugins/source/isoimage-isohybrid.py

index 24299c1ece17963524bef079e92f45582c5af791..95a54a09d21be9128ce99b8c21d26da8e952a8a3 100644 (file)
@@ -347,8 +347,10 @@ class IsoImagePlugin(SourcePlugin):
             # dosfs image for EFI boot
             bootimg = "%s/efi.img" % isodir
 
-            dosfs_cmd = 'mkfs.vfat -n "EFIimg" -S 512 -C %s %d' \
-                        % (bootimg, blocks)
+            esp_label = source_params.get('esp_label', 'EFIimg')
+
+            dosfs_cmd = 'mkfs.vfat -n \'%s\' -S 512 -C %s %d' \
+                        % (esp_label, bootimg, blocks)
             exec_native_cmd(dosfs_cmd, native_sysroot)
 
             mmd_cmd = "mmd -i %s ::/EFI" % bootimg