From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5EDF21FF13E for ; Fri, 03 Apr 2026 18:57:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21BDC8D2B; Fri, 3 Apr 2026 18:57:42 +0200 (CEST) From: Christoph Heiss To: pdm-devel@lists.proxmox.com Subject: [PATCH installer v3 33/38] auto: sysinfo: switch to types from proxmox-installer-types Date: Fri, 3 Apr 2026 18:54:05 +0200 Message-ID: <20260403165437.2166551-34-c.heiss@proxmox.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260403165437.2166551-1-c.heiss@proxmox.com> References: <20260403165437.2166551-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1775235396313 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 42GQQBRKIXX3JM4JXOVZUN4KPH4HNYIM X-Message-ID-Hash: 42GQQBRKIXX3JM4JXOVZUN4KPH4HNYIM X-MailFrom: c.heiss@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: No functional changes. Signed-off-by: Christoph Heiss --- Changes v2 -> v3: * new patch proxmox-auto-install-assistant/src/main.rs | 9 +- proxmox-auto-installer/src/sysinfo.rs | 106 ++++++++---------- proxmox-fetch-answer/Cargo.toml | 1 + .../src/fetch_plugins/http.rs | 7 +- proxmox-installer-common/src/lib.rs | 1 - proxmox-installer-common/src/sysinfo.rs | 52 --------- 6 files changed, 56 insertions(+), 120 deletions(-) delete mode 100644 proxmox-installer-common/src/sysinfo.rs diff --git a/proxmox-auto-install-assistant/src/main.rs b/proxmox-auto-install-assistant/src/main.rs index 901ab81..a92ac75 100644 --- a/proxmox-auto-install-assistant/src/main.rs +++ b/proxmox-auto-install-assistant/src/main.rs @@ -19,7 +19,7 @@ use std::{ use proxmox_auto_installer::{ answer::{Answer, FilterMatch}, - sysinfo::SysInfo, + sysinfo, utils::{ AutoInstSettings, FetchAnswerFrom, HttpOptions, default_partition_label, get_matched_udev_indexes, get_nic_list, get_single_udev_index, verify_disks_settings, @@ -674,10 +674,9 @@ fn validate_answer(args: &CommandValidateAnswerArgs) -> Result<()> { } fn show_system_info(_args: &CommandSystemInfoArgs) -> Result<()> { - match SysInfo::as_json_pretty() { - Ok(res) => println!("{res}"), - Err(err) => eprintln!("Error fetching system info: {err}"), - } + let info = sysinfo::get().context("fetching system info")?; + println!("{}", serde_json::to_string_pretty(&info)?); + Ok(()) } diff --git a/proxmox-auto-installer/src/sysinfo.rs b/proxmox-auto-installer/src/sysinfo.rs index fe3a10d..5129829 100644 --- a/proxmox-auto-installer/src/sysinfo.rs +++ b/proxmox-auto-installer/src/sysinfo.rs @@ -1,66 +1,54 @@ use anyhow::{Result, bail}; -use proxmox_installer_common::{ - RUNTIME_DIR, - setup::{IsoInfo, ProductConfig, SetupInfo}, - sysinfo::SystemDMI, -}; -use serde::Serialize; use std::{fs, io, path::PathBuf}; use crate::utils::get_nic_list; +use proxmox_installer_common::{ + RUNTIME_DIR, + setup::{ProxmoxProduct, SetupInfo}, +}; +use proxmox_installer_types::{NetworkInterface, SystemInfo}; -#[derive(Debug, Serialize)] -pub struct SysInfo { - product: ProductConfig, - iso: IsoInfo, - dmi: SystemDMI, - network_interfaces: Vec, -} - -impl SysInfo { - pub fn get() -> Result { - let path = PathBuf::from(RUNTIME_DIR).join("iso-info.json").to_owned(); - let setup_info: SetupInfo = match fs::File::open(path) { - Ok(iso_info_file) => { - let reader = io::BufReader::new(iso_info_file); - serde_json::from_reader(reader)? - } - Err(err) if err.kind() == io::ErrorKind::NotFound => SetupInfo::mocked(), - Err(err) => bail!("failed to open iso-info.json - {err}"), - }; - - Ok(Self { - product: setup_info.config, - iso: setup_info.iso_info, - network_interfaces: NetdevWithMac::get_all()?, - dmi: SystemDMI::get()?, - }) - } - - pub fn as_json_pretty() -> Result { - let info = Self::get()?; - Ok(serde_json::to_string_pretty(&info)?) - } -} - -#[derive(Debug, Serialize)] -struct NetdevWithMac { - /// The network link name - pub link: String, - /// The MAC address of the network device - pub mac: String, -} - -impl NetdevWithMac { - fn get_all() -> Result> { - let mut result: Vec = Vec::new(); - - let links = get_nic_list()?; - for link in links { - let mac = fs::read_to_string(format!("/sys/class/net/{link}/address"))?; - let mac = String::from(mac.trim()); - result.push(Self { link, mac }); +pub fn get() -> Result { + let path = PathBuf::from(RUNTIME_DIR).join("iso-info.json").to_owned(); + let setup_info: SetupInfo = match fs::File::open(path) { + Ok(iso_info_file) => { + let reader = io::BufReader::new(iso_info_file); + serde_json::from_reader(reader)? } - Ok(result) - } + Err(err) if err.kind() == io::ErrorKind::NotFound => SetupInfo::mocked(), + Err(err) => bail!("failed to open iso-info.json - {err}"), + }; + + Ok(SystemInfo { + product: proxmox_installer_types::ProductConfig { + fullname: setup_info.config.fullname, + product: match setup_info.config.product { + ProxmoxProduct::PVE => proxmox_installer_types::ProxmoxProduct::Pve, + ProxmoxProduct::PBS => proxmox_installer_types::ProxmoxProduct::Pbs, + ProxmoxProduct::PMG => proxmox_installer_types::ProxmoxProduct::Pmg, + ProxmoxProduct::PDM => proxmox_installer_types::ProxmoxProduct::Pdm, + }, + enable_btrfs: setup_info.config.enable_btrfs, + }, + iso: proxmox_installer_types::IsoInfo { + release: setup_info.iso_info.release, + isorelease: setup_info.iso_info.isorelease, + }, + network_interfaces: get_all_network_interfaces()?, + dmi: proxmox_installer_common::dmi::get()?, + }) +} + +fn get_all_network_interfaces() -> Result> { + let mut result: Vec = Vec::new(); + + let links = get_nic_list()?; + for link in links { + let mac = fs::read_to_string(format!("/sys/class/net/{link}/address"))?; + result.push(NetworkInterface { + link, + mac: mac.trim().parse()?, + }); + } + Ok(result) } diff --git a/proxmox-fetch-answer/Cargo.toml b/proxmox-fetch-answer/Cargo.toml index d779ad4..2d3b149 100644 --- a/proxmox-fetch-answer/Cargo.toml +++ b/proxmox-fetch-answer/Cargo.toml @@ -15,6 +15,7 @@ anyhow.workspace = true log.workspace = true proxmox-auto-installer.workspace = true proxmox-installer-common = { workspace = true, features = ["http"] } +proxmox-installer-types.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true toml.workspace = true diff --git a/proxmox-fetch-answer/src/fetch_plugins/http.rs b/proxmox-fetch-answer/src/fetch_plugins/http.rs index b958a35..fceabc2 100644 --- a/proxmox-fetch-answer/src/fetch_plugins/http.rs +++ b/proxmox-fetch-answer/src/fetch_plugins/http.rs @@ -6,8 +6,9 @@ use std::{ process::Command, }; -use proxmox_auto_installer::{sysinfo::SysInfo, utils::HttpOptions}; +use proxmox_auto_installer::{sysinfo, utils::HttpOptions}; use proxmox_installer_common::http::{self, header::HeaderMap}; +use proxmox_installer_types::SystemInfo; static ANSWER_URL_SUBDOMAIN: &str = "proxmox-auto-installer"; static ANSWER_CERT_FP_SUBDOMAIN: &str = "proxmox-auto-installer-cert-fingerprint"; @@ -70,7 +71,7 @@ struct HttpFetchPayload { schema: HttpFetchInfoSchema, /// Information about the running system, flattened into this structure directly. #[serde(flatten)] - sysinfo: SysInfo, + sysinfo: SystemInfo, } impl HttpFetchPayload { @@ -79,7 +80,7 @@ impl HttpFetchPayload { fn get() -> Result { Ok(Self { schema: HttpFetchInfoSchema::default(), - sysinfo: SysInfo::get()?, + sysinfo: sysinfo::get()?, }) } diff --git a/proxmox-installer-common/src/lib.rs b/proxmox-installer-common/src/lib.rs index 05445d5..fde17b7 100644 --- a/proxmox-installer-common/src/lib.rs +++ b/proxmox-installer-common/src/lib.rs @@ -2,7 +2,6 @@ pub mod disk_checks; pub mod dmi; pub mod options; pub mod setup; -pub mod sysinfo; #[cfg(feature = "http")] pub mod http; diff --git a/proxmox-installer-common/src/sysinfo.rs b/proxmox-installer-common/src/sysinfo.rs deleted file mode 100644 index 05e6de6..0000000 --- a/proxmox-installer-common/src/sysinfo.rs +++ /dev/null @@ -1,52 +0,0 @@ -use std::{collections::HashMap, fs}; - -use anyhow::{Result, bail}; -use serde::Serialize; - -const DMI_PATH: &str = "/sys/devices/virtual/dmi/id"; - -#[derive(Debug, Serialize)] -pub struct SystemDMI { - system: HashMap, - baseboard: HashMap, - chassis: HashMap, -} - -impl SystemDMI { - pub fn get() -> Result { - let system_files = [ - "product_serial", - "product_sku", - "product_uuid", - "product_name", - ]; - let baseboard_files = ["board_asset_tag", "board_serial", "board_name"]; - let chassis_files = ["chassis_serial", "chassis_sku", "chassis_asset_tag"]; - - Ok(Self { - system: Self::get_dmi_infos(&system_files)?, - baseboard: Self::get_dmi_infos(&baseboard_files)?, - chassis: Self::get_dmi_infos(&chassis_files)?, - }) - } - - fn get_dmi_infos(files: &[&str]) -> Result> { - let mut res: HashMap = HashMap::new(); - - for file in files { - let path = format!("{DMI_PATH}/{file}"); - let content = match fs::read_to_string(&path) { - Err(ref err) if err.kind() == std::io::ErrorKind::NotFound => continue, - Err(ref err) if err.kind() == std::io::ErrorKind::PermissionDenied => { - bail!("Could not read data. Are you running as root or with sudo?") - } - Err(err) => bail!("Error: '{err}' on '{path}'"), - Ok(content) => content.trim().into(), - }; - let key = file.splitn(2, '_').last().unwrap(); - res.insert(key.into(), content); - } - - Ok(res) - } -} -- 2.53.0