From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 232719A256 for ; Tue, 14 Nov 2023 18:32:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 036C41F0AF for ; Tue, 14 Nov 2023 18:31:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 14 Nov 2023 18:31:55 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D48EE42AE8 for ; Tue, 14 Nov 2023 18:31:54 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 14 Nov 2023 18:31:48 +0100 Message-Id: <20231114173148.1141998-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114173148.1141998-1-s.ivanov@proxmox.com> References: <20231114173148.1141998-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.090 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [install.pm, config.pm] Subject: [pve-devel] [PATCH installer 2/2] serial install: fix console parameter parsing 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: , X-List-Received-Date: Tue, 14 Nov 2023 17:32:26 -0000 The regex matching in Proxmox::Install::Config was blindly copied from above - so the other parameters are also likely to not get recognized if they are the last on the cmdline Signed-off-by: Stoiko Ivanov --- Proxmox/Install.pm | 2 +- Proxmox/Install/Config.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm index a289037..66adb2d 100644 --- a/Proxmox/Install.pm +++ b/Proxmox/Install.pm @@ -1154,7 +1154,7 @@ _EOD update_progress(0.8, 0.95, 1, "make system bootable"); my $console_param=''; if (my $console = Proxmox::Install::Config::get_console()) { - my $console_param="console=$console";; + $console_param="console=$console"; my $console_snippet = "GRUB_CMDLINE_LINUX=\"\$GRUB_CMDLINE_LINUX $console_param\""; file_write_all("$targetdir/etc/default/grub.d/console.cfg", $console_snippet); } diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm index 55e53c7..5e80255 100644 --- a/Proxmox/Install/Config.pm +++ b/Proxmox/Install/Config.pm @@ -43,7 +43,7 @@ my sub parse_kernel_cmdline { } } - if ($cmdline =~ m/console=(\S+)[\s\n]/i) { + if ($cmdline =~ m/console=(\S+)[\s\n]?/i) { $cfg->{console} = $1; } -- 2.39.2