Skip to contentSkip to conversation

wic: bootimg-efi: add label source parameter

PATCH New [email protected] 1 participant 1 message May 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 wic: bootimg-efi: add label source parameter

From: Chee Yang Lee <[email protected]>

Add new source parameter label to allow custom boot.conf/grub.cfg label, so far it's hardcoded to "Boot".

Default label to "Boot" for systemd-boot and blank for grub-efi when source parameter label are not set.

Signed-off-by Chee Yang Lee <chee.yang.lee at intel.com>
---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
scripts/lib/wic/plugins/source/bootimg-efi.py +15 -4
index 652323f..70cc1b0 100644
@@ -73,8 +73,13 @@ class BootimgEFIPlugin(SourcePlugin):
 
             kernel = "/bzImage"
 
-            grubefi_conf += "linux %s root=%s rootwait %s\n" \
-                % (kernel, creator.rootdev, bootloader.append)
+            label = source_params.get('label')
+            label_conf = "root=%s" % creator.rootdev
+            if label:
+                label_conf = "LABEL=%s" % label
+
+            grubefi_conf += "linux %s %s rootwait %s\n" \
+                % (kernel, label_conf, bootloader.append)
 
             if initrd:
                grubefi_conf += "initrd /%s\n" % initrd
@@ -144,8 +149,14 @@ class BootimgEFIPlugin(SourcePlugin):
             boot_conf = ""
             boot_conf += "title %s\n" % (title if title else "boot")
             boot_conf += "linux %s\n" % kernel
-            boot_conf += "options LABEL=Boot root=%s %s\n" % \
-                             (creator.rootdev, bootloader.append)
+
+            label = source_params.get('label')
+            label_conf = "LABEL=Boot root=%s" % creator.rootdev
+            if label:
+                label_conf = "LABEL=%s" % label
+
+            boot_conf += "options %s %s\n" % \
+                             (label_conf, bootloader.append)
 
             if initrd:
                 boot_conf += "initrd /%s\n" % initrd
Signature · 1 line
2.7.4