From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 2/2] serial install: fix console parameter parsing
Date: Tue, 14 Nov 2023 18:31:48 +0100 [thread overview]
Message-ID: <20231114173148.1141998-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20231114173148.1141998-1-s.ivanov@proxmox.com>
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 <s.ivanov@proxmox.com>
---
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
next prev parent reply other threads:[~2023-11-14 17:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 17:31 [pve-devel] [PATCH installer 0/2] minimal changes for a working serial installation Stoiko Ivanov
2023-11-14 17:31 ` [pve-devel] [PATCH installer 1/2] d/control: add libgtk3-perl to B-D Stoiko Ivanov
2023-11-14 17:31 ` Stoiko Ivanov [this message]
2023-11-14 17:44 ` [pve-devel] applied-series: [PATCH installer 0/2] minimal changes for a working serial installation Thomas Lamprecht
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=20231114173148.1141998-3-s.ivanov@proxmox.com \
--to=s.ivanov@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