From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7AE1A1FF183 for ; Mon, 11 Nov 2024 12:06:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2B588885; Mon, 11 Nov 2024 12:06:01 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 11 Nov 2024 12:05:15 +0100 Message-ID: <20241111110523.261482-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241111110523.261482-1-c.heiss@proxmox.com> References: <20241111110523.261482-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH installer v3 1/3] low level: config: filter out kernel cmdline on word boundaries X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 Signed-off-by: Christoph Heiss --- Changes v2 -> v3: * rebased on latest master Changes v1 -> v2: * split commandline along whitespace and filter individually, to avoid problems with regexes and word boundaries Proxmox/Install/Config.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm index d604676..4152a77 100644 --- a/Proxmox/Install/Config.pm +++ b/Proxmox/Install/Config.pm @@ -43,10 +43,12 @@ my sub parse_kernel_cmdline { } } - $cmdline =~ s/(?:BOOT_IMAGE|root|ramdisk_size|splash|vga)=\S+\s?//gi; - $cmdline =~ s/ro|rw|quiet|proxdebug|proxtui//gi; + my @filtered = grep { + $_ !~ m/^(BOOT_IMAGE|root|ramdisk_size|splash|vga)=\S+$/ && + $_ !~ m/^(ro|rw|quiet|proxdebug|proxtui)$/ + } split(/\s+/, $cmdline); - $cfg->{target_cmdline}= $cmdline; + $cfg->{target_cmdline} = join(' ', @filtered); return $cfg; } -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel