all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Noel Ullreich <n.ullreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve_installer] tui-installer: don't aborted install if min requirements not met
Date: Thu,  6 Jul 2023 13:52:12 +0200	[thread overview]
Message-ID: <20230706115212.86875-1-n.ullreich@proxmox.com> (raw)

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>
---
 proxmox-tui-installer/src/main.rs   | 17 +++++++++++++++--
 proxmox-tui-installer/src/system.rs | 14 +-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs
index 64f21fa..e9a3fb4 100644
--- a/proxmox-tui-installer/src/main.rs
+++ b/proxmox-tui-installer/src/main.rs
@@ -191,6 +191,8 @@ fn main() {
         Err(err) => initial_setup_error(&mut siv, &err),
     };
 
+    has_min_requirements(&runtime_info, &mut siv);
+
     siv.clear_global_callbacks(Event::CtrlChar('c'));
     siv.set_on_pre_event(Event::CtrlChar('c'), trigger_abort_install_dialog);
 
@@ -243,8 +245,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())
@@ -291,6 +291,19 @@ fn initial_setup_error(siv: &mut CursiveRunnable, message: &str) -> ! {
     std::process::exit(1);
 }
 
+fn has_min_requirements(info: &RuntimeInfo, siv: &mut CursiveRunnable) -> () {
+    if info.total_memory < 1024 {
+        siv.add_layer(
+            Dialog::around(TextView::new(concat!(
+            "Less than 1 GiB of usable memory detected, installation will probably fail.\n\n",
+            "See 'System Requirements' in the documentation.")))
+                .title("Installer setup error")
+                .button("Ok", Cursive::quit),
+        );
+        siv.run();
+    }
+}
+
 fn display_setup_warning(siv: &mut Cursive, message: &str) {
     siv.add_layer(Dialog::info(message).title("Warning"));
 }
diff --git a/proxmox-tui-installer/src/system.rs b/proxmox-tui-installer/src/system.rs
index baceab9..7378dba 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





             reply	other threads:[~2023-07-06 11:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-06 11:52 Noel Ullreich [this message]
2023-07-06 12:19 ` Christoph Heiss

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=20230706115212.86875-1-n.ullreich@proxmox.com \
    --to=n.ullreich@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal