From patchwork Thu Apr 9 11:17:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gourav Singh X-Patchwork-Id: 85670 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BE38EA3C51 for ; Thu, 9 Apr 2026 11:19:32 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.129505.1775733566063725760 for ; Thu, 09 Apr 2026 04:19:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=gouravsingh@siemens.com header.s=fm2 header.b=Rm+xOLzf; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-1333022-202604091119225899ef34ba000207ce-pbpcjf@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202604091119225899ef34ba000207ce for ; Thu, 09 Apr 2026 13:19:23 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=gouravsingh@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=t45p/aWvLp63c88KaUITPoFQxrEcTByo7zHrA+8KKX8=; b=Rm+xOLzfeetNFQzO8DQiQf9IF7zfln/pzEIFQAOwAMy8QPrOXYBLXA/Ujjnn2QgGUHAVjq kwyeYql1Dk1WcRE6PkvUphVSKT9i0wVsotbYmUa0MKOito4dxtDW4ksff1+SuXwX6D5hdbex vYo5/t/umdcDekZFbAriESeGoUmOPvqGebRKjvSU9VfCoW5LhbECsjIfYeq+OACZRQsff+F/ vW7AgE8Lm/uapPJ32/A8GuS7ttcTTCrlrqrVdkgrAl4v6V/U7n/E7u3vNKX248tN0Y+vkqnB 2lnq9RGB3PHMmkDnljHEJgVT95k047KqFr30zD4mQz2o2zscmXZQAvEQ==; From: Gourav Singh To: yocto-patches@lists.yoctoproject.org Cc: cedric.hombourger@siemens.com, Gourav Singh Subject: [wic][PATCH] wic/plugins: gate root= with creator.rootdev for efi and pcbios Date: Thu, 9 Apr 2026 16:47:52 +0530 Message-Id: <20260409111752.3441850-1-gouravsingh@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1333022:519-21489:flowmailer List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 09 Apr 2026 11:19:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/3674 Checks for creator.rootdev not being None were missing and would cause the kernel command line to read "root=None". When using the Discoverable Partitions Specification, we really want no root= parameter on the kernel command line (and root=None is anyhow not a valid option). Signed-off-by: Cedric Hombourger Signed-off-by: Gourav Singh --- src/wic/plugins/source/bootimg_efi.py | 5 +++-- src/wic/plugins/source/bootimg_pcbios.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) -- 2.39.5 diff --git a/src/wic/plugins/source/bootimg_efi.py b/src/wic/plugins/source/bootimg_efi.py index 69aa38b..7d2175d 100644 --- a/src/wic/plugins/source/bootimg_efi.py +++ b/src/wic/plugins/source/bootimg_efi.py @@ -97,7 +97,7 @@ class BootimgEFIPlugin(SourcePlugin): (get_bitbake_var("KERNEL_IMAGETYPE"), get_bitbake_var("INITRAMFS_LINK_NAME")) label = source_params.get('label') - label_conf = "root=%s" % creator.rootdev + label_conf = f"root={creator.rootdev}" if creator.rootdev else "" if label: label_conf = "LABEL=%s" % label @@ -186,7 +186,8 @@ class BootimgEFIPlugin(SourcePlugin): boot_conf += "linux /%s\n" % kernel label = source_params.get('label') - label_conf = "LABEL=Boot root=%s" % creator.rootdev + label_conf = "LABEL=Boot" + label_conf += f" root={creator.rootdev}" if creator.rootdev else "" if label: label_conf = "LABEL=%s" % label diff --git a/src/wic/plugins/source/bootimg_pcbios.py b/src/wic/plugins/source/bootimg_pcbios.py index 1e5ec3a..b49d48d 100644 --- a/src/wic/plugins/source/bootimg_pcbios.py +++ b/src/wic/plugins/source/bootimg_pcbios.py @@ -231,8 +231,10 @@ class BootimgPcbiosPlugin(SourcePlugin): kernel = "/" + get_bitbake_var("KERNEL_IMAGETYPE") syslinux_conf += "KERNEL " + kernel + "\n" - syslinux_conf += "APPEND label=boot root=%s %s\n" % \ - (creator.rootdev, bootloader.append) + # Check if rootdev exists + root_param = f"root={creator.rootdev}" if creator.rootdev else "" + + syslinux_conf += f"APPEND label=boot {root_param} {bootloader.append}\n" logger.debug("Writing syslinux config %s/syslinux.cfg", hdddir) cfg = open("%s/hdd/boot/syslinux.cfg" % cr_workdir, "w")