[pve-devel] [PATCH pve_installer v3] tui: don't abort install if min ram requirement is not met

[pve-devel] [PATCH pve_installer v3] tui: don't abort install if min ram requirement is not met

[Noel Ullreich]

If the minimum requirements are not met, the TUI installer will create a
popup notifying you that the install might not work and then exits the
installer.
While the GUI also creates such a popup, it will not exit the installer.
This patch adapts the behavior of the GUI: the TUI creates a popup
warning you that min spec is not met but doesn't abort the install.

Signed-off-by: Noel Ullreich <n.ullreich@proxmox.com>
---
changes from v1:
* moved the min ram check into `installer_setup_late`
* fixed spelling in the subject line

changes from v2:
* fixed formatting
* removed unnecessary `installer_setup_late` call

 proxmox-tui-installer/src/main.rs   | 13 +++++++++++--
 proxmox-tui-installer/src/system.rs | 14 +-------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs
index 64f21fa..8721358 100644
--- a/proxmox-tui-installer/src/main.rs
+++ b/proxmox-tui-installer/src/main.rs
@@ -243,8 +243,6 @@ fn installer_setup(in_test_mode: bool) -> Result<(LocaleInfo, RuntimeInfo), Stri
             .map_err(|err| format!("Failed to retrieve runtime environment info: {err}"))?
     };
 
-    system::has_min_requirements(&runtime_info)?;
-
     runtime_info.disks.sort();
     if runtime_info.disks.is_empty() {
         Err("The installer could not find any supported hard disks.".to_owned())
@@ -256,6 +254,7 @@ fn installer_setup(in_test_mode: bool) -> Result<(LocaleInfo, RuntimeInfo), Stri
 /// Anything that can be done late in the setup and will not result in fatal errors.
 fn installer_setup_late(siv: &mut Cursive) {
     let state = siv.user_data::<InstallerState>().unwrap();
+    let total_memory = state.runtime_info.total_memory;
 
     if !state.in_test_mode {
         let kmap_id = &state.options.timezone.kb_layout;
@@ -266,6 +265,16 @@ fn installer_setup_late(siv: &mut Cursive) {
         }
     }
 
+    if total_memory < 1024 {
+        display_setup_warning(
+            siv,
+            concat!(
+                "Less than 1 GiB of usable memory detected, installation will probably fail.\n\n",
+                "See 'System Requirements' in the documentation."
+            ),
+        );
+    }
+
     if setup_info().config.product == setup::ProxmoxProduct::PVE {
         let cpu_hvm = procfs::read_cpuinfo().map(|info| info.hvm).unwrap_or(false);
         if !cpu_hvm {
diff --git a/proxmox-tui-installer/src/system.rs b/proxmox-tui-installer/src/system.rs
index baceab9..bbf13b8 100644
--- a/proxmox-tui-installer/src/system.rs
+++ b/proxmox-tui-installer/src/system.rs
@@ -1,18 +1,6 @@
 use std::{fs::OpenOptions, io::Write, process::Command};
 
-use crate::setup::{KeyboardMapping, RuntimeInfo};
-
-pub fn has_min_requirements(info: &RuntimeInfo) -> Result<(), String> {
-    if info.total_memory < 1024 {
-        return Err(concat!(
-            "Less than 1 GiB of usable memory detected, installation will probably fail.\n\n",
-            "See 'System Requirements' in the documentation."
-        )
-        .to_owned());
-    }
-
-    Ok(())
-}
+use crate::setup::KeyboardMapping;
 
 pub fn set_keyboard_layout(kmap: &KeyboardMapping) -> Result<(), String> {
     Command::new("setxkbmap")
-- 
2.39.2

Re: [pve-devel] [PATCH pve_installer v3] tui: don't abort install if min ram requirement is not met

[Christoph Heiss]

LGTM.

On Mon, Jul 10, 2023 at 11:22:27AM +0200, Noel Ullreich wrote:
> If the minimum requirements are not met, the TUI installer will create a
> popup notifying you that the install might not work and then exits the
> installer.
> While the GUI also creates such a popup, it will not exit the installer.
> This patch adapts the behavior of the GUI: the TUI creates a popup
> warning you that min spec is not met but doesn't abort the install.
>

Reviewed-by: Christoph Heiss <c.heiss@proxmox.com>
Tested-by: Christoph Heiss <c.heiss@proxmox.com>
> Signed-off-by: Noel Ullreich <n.ullreich@proxmox.com>
> ---
> changes from v1:
> * moved the min ram check into `installer_setup_late`
> * fixed spelling in the subject line
>
> changes from v2:
> * fixed formatting
> * removed unnecessary `installer_setup_late` call
>
>  proxmox-tui-installer/src/main.rs   | 13 +++++++++++--
>  proxmox-tui-installer/src/system.rs | 14 +-------------
>  2 files changed, 12 insertions(+), 15 deletions(-)
>
> [..]

[pve-devel] applied: [PATCH pve_installer v3] tui: don't abort install if min ram requirement is not met

[Thomas Lamprecht]

Am 10/07/2023 um 11:22 schrieb Noel Ullreich:
> If the minimum requirements are not met, the TUI installer will create a
> popup notifying you that the install might not work and then exits the
> installer.
> While the GUI also creates such a popup, it will not exit the installer.
> This patch adapts the behavior of the GUI: the TUI creates a popup
> warning you that min spec is not met but doesn't abort the install.
> 
> Signed-off-by: Noel Ullreich <n.ullreich@proxmox.com>
> ---
> changes from v1:
> * moved the min ram check into `installer_setup_late`
> * fixed spelling in the subject line
> 
> changes from v2:
> * fixed formatting
> * removed unnecessary `installer_setup_late` call
> 
>  proxmox-tui-installer/src/main.rs   | 13 +++++++++++--
>  proxmox-tui-installer/src/system.rs | 14 +-------------
>  2 files changed, 12 insertions(+), 15 deletions(-)
> 
>

applied, with a context merge conflict resolved and total_memory folded into
the if expression directly, as proposed by Christoph when reviewing v2, as with
his patch for central hvm-support applied previously we now have a owned "state"
available, thanks!