[pve-devel] [PATCH installer 0/2] minimal changes for a working serial installation

[pve-devel] [PATCH installer 0/2] minimal changes for a working serial installation

[Stoiko Ivanov]

patch 1/2 is a tiny issue I ran into while building  the installer

patch 2/2 adds the correct console parameter for serial installations
patch 2/2 needs some further work (the other kernel cmdline parameter
matchings are probably wrong as well, additionally #4747 would be a better
and more general solution for what to add to the cmdline from the install
environment) - I'll try to send a follow-up tomorrow

Stoiko Ivanov (2):
  d/control: add libgtk3-perl to B-D
  serial install: fix console parameter parsing

 Proxmox/Install.pm        | 2 +-
 Proxmox/Install/Config.pm | 2 +-
 debian/control            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

-- 
2.39.2

[pve-devel] [PATCH installer 1/2] d/control: add libgtk3-perl to B-D

[Stoiko Ivanov]

With the first tests entering the installer in
9a0d66cb36d395a1186904132aed1d5dc33a0937

we now need libgtk3-perl during package-building with `make deb`

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index d77b12a..9057f59 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: cargo:native,
                debhelper-compat (= 12),
                iso-codes,
+               libgtk3-perl,
                libpve-common-perl,
                librsvg2-bin,
                librust-cursive+termion-backend-dev (>= 0.20.0),
-- 
2.39.2

[pve-devel] [PATCH installer 2/2] serial install: fix console parameter parsing

[Stoiko Ivanov]

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

[pve-devel] applied-series: [PATCH installer 0/2] minimal changes for a working serial installation

[Thomas Lamprecht]

Am 14/11/2023 um 18:31 schrieb Stoiko Ivanov:
> patch 1/2 is a tiny issue I ran into while building  the installer
> 
> patch 2/2 adds the correct console parameter for serial installations
> patch 2/2 needs some further work (the other kernel cmdline parameter
> matchings are probably wrong as well, additionally #4747 would be a better
> and more general solution for what to add to the cmdline from the install
> environment) - I'll try to send a follow-up tomorrow
> 
> Stoiko Ivanov (2):
>   d/control: add libgtk3-perl to B-D
>   serial install: fix console parameter parsing
> 
>  Proxmox/Install.pm        | 2 +-
>  Proxmox/Install/Config.pm | 2 +-
>  debian/control            | 1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 


applied series, thanks!