From: "Alexander Zeidler" <a.zeidler@proxmox.com>
To: "Proxmox VE development discussion" <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH installer 1/2] low level: config: filter out kernel cmdline on word boundaries
Date: Wed, 14 Aug 2024 12:51:27 +0200 [thread overview]
Message-ID: <D3FKSLI4OSMR.OAME66V4BJTZ@proxmox.com> (raw)
In-Reply-To: <20240809115145.1005005-2-c.heiss@proxmox.com>
On Fri Aug 9, 2024 at 1:51 PM CEST, Christoph Heiss wrote:
> Otherwise, substrings might get replaced, e.g. the replacement
> `proxmox-start-auto-installer` -> `pxmox-start-auto-installer` would be
> done.
>
> Fixes: a02a78a ("fix #4747: pass kernel cmdline parameters to target system")
> Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
> Proxmox/Install/Config.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm
> index ae70093..6b064b1 100644
> --- a/Proxmox/Install/Config.pm
> +++ b/Proxmox/Install/Config.pm
> @@ -43,8 +43,8 @@ my sub parse_kernel_cmdline {
> }
> }
>
> - $cmdline =~ s/(?:BOOT_IMAGE|root|ramdisk_size|splash|vga)=\S+\s?//gi;
> - $cmdline =~ s/ro|rw|quiet|proxdebug|proxtui|nomodeset//gi;
> + $cmdline =~ s/\b(?:BOOT_IMAGE|root|ramdisk_size|splash|vga)=\S+\s?\b//gi;
> + $cmdline =~ s/\bro|rw|quiet|proxdebug|proxtui|nomodeset\b//gi;
There are parentheses missing next to \b .
The current implementation seems not to be strict enough when dealing
with variables. For example, the variable regex would not match
something like 'apic=quiet', but then the second regex matches wrongly
'quiet'.
>
> $cfg->{target_cmdline}= $cmdline;
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-08-14 10:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-09 11:51 [pve-devel] [PATCH installer 0/2] properly filter out all installer-related kernel arguments Christoph Heiss
2024-08-09 11:51 ` [pve-devel] [PATCH installer 1/2] low level: config: filter out kernel cmdline on word boundaries Christoph Heiss
2024-08-14 10:51 ` Alexander Zeidler [this message]
2024-08-21 9:35 ` Christoph Heiss
2024-08-09 11:51 ` [pve-devel] [PATCH installer 2/2] low level: config: filter out all installer-related kernel arguments Christoph Heiss
2024-08-21 13:24 ` [pve-devel] [PATCH installer 0/2] properly " Christoph Heiss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D3FKSLI4OSMR.OAME66V4BJTZ@proxmox.com \
--to=a.zeidler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox