proxmox-mirrors/pve-installer
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-installer synced 2025-04-28 16:34:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

auto-installer: handle auto-reboot info messages directly

Browse Source 
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Christoph Heiss 2024-04-22 14:11:07 +02:00 committed by Thomas Lamprecht
parent dd29e29454
commit 5878dc4ae6
9 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proxmox-auto-installer/src/bin/proxmox-auto-installer.rs
View File

@ -5,6 +5,8 @@ use std::{
io::{BufRead, BufReader, Write},
path::PathBuf,
process::ExitCode,
thread,
time::Duration,
};
use proxmox_installer_common::setup::{
@ -94,6 +96,11 @@ fn main() -> ExitCode {
// TODO: (optionally) do a HTTP post with basic system info, like host SSH public key(s) here
for secs in (0..=5).rev() {
info!("Installation finished - auto-rebooting in {secs} seconds ..");
thread::sleep(Duration::from_secs(1));
}
ExitCode::SUCCESS
}
@ -170,7 +177,8 @@ fn run_installation(
if state == "err" {
bail!("{message}");
}
info!("Finished: '{state}' {message}");
// Do not print anything if the installation was successful,
// as we handle that here ourselves
}
};
}

7
proxmox-auto-installer/src/utils.rs
View File

@ -368,7 +368,7 @@ pub fn parse_answer(
verify_locale_settings(answer, locales)?;
let mut config = InstallConfig {
autoreboot: 1_usize,
autoreboot: 0,
filesys: filesystem,
hdsize: 0.,
swapsize: None,
@ -426,6 +426,11 @@ pub fn parse_answer(
.unwrap_or(runtime_info.disks[first_selected_disk].size);
}
}
// never print the auto reboot text after finishing to avoid the delay, as this is handled by
// the auto-installer itself anyway. The auto-installer might still perform some post-install
// steps after running the low-level installer.
config.autoreboot = 0;
Ok(config)
}

2
proxmox-auto-installer/tests/resources/parse_answer/disk_match.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "192.168.1.114/24",
"country": "at",
"dns": "192.168.1.254",

2
proxmox-auto-installer/tests/resources/parse_answer/disk_match_all.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "192.168.1.114/24",
"country": "at",
"dns": "192.168.1.254",

2
proxmox-auto-installer/tests/resources/parse_answer/disk_match_any.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "192.168.1.114/24",
"country": "at",
"dns": "192.168.1.254",

2
proxmox-auto-installer/tests/resources/parse_answer/minimal.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "192.168.1.114/24",
"country": "at",
"dns": "192.168.1.254",

2
proxmox-auto-installer/tests/resources/parse_answer/nic_matching.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "10.10.10.10/24",
"country": "at",
"dns": "10.10.10.1",

2
proxmox-auto-installer/tests/resources/parse_answer/specific_nic.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "10.10.10.10/24",
"country": "at",
"dns": "10.10.10.1",

2
proxmox-auto-installer/tests/resources/parse_answer/zfs.json
View File

@ -1,5 +1,5 @@
{
"autoreboot": 1,
"autoreboot": 0,
"cidr": "192.168.1.114/24",
"country": "at",
"dns": "192.168.1.254",