serial install: fix console parameter parsing

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>

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index a289037e804af6896d46f2803fb9473cbf9c5824..66adb2dc5f262faac895c17c6da693d928e59c84 100644 (file)
--- 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 55e53c7e78d8d22e1f801c105b7dac08faea5fd1..5e8025542d3c71a9e8be8cb586e5a6c019546f43 100644 (file)
--- 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;
     }