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 59CC81FF2C6 for ; Wed, 10 Jul 2024 15:27:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24A3DA318; Wed, 10 Jul 2024 15:28:13 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 10 Jul 2024 15:27:42 +0200 Message-ID: <20240710132756.1149508-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240710132756.1149508-1-c.heiss@proxmox.com> References: <20240710132756.1149508-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [setup.rs, sysinfo.rs, lib.rs, main.rs] Subject: [pve-devel] [PATCH installer 03/14] tree-wide: collect hardcoded installer runtime directory strings into constant X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" No functional changes. Signed-off-by: Christoph Heiss --- proxmox-auto-installer/src/sysinfo.rs | 10 +++++++--- proxmox-chroot/src/main.rs | 11 ++++++++--- proxmox-installer-common/src/lib.rs | 2 ++ proxmox-installer-common/src/setup.rs | 11 ++++++----- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/proxmox-auto-installer/src/sysinfo.rs b/proxmox-auto-installer/src/sysinfo.rs index 05f7f50..112e898 100644 --- a/proxmox-auto-installer/src/sysinfo.rs +++ b/proxmox-auto-installer/src/sysinfo.rs @@ -1,7 +1,10 @@ use anyhow::{bail, Result}; -use proxmox_installer_common::setup::{IsoInfo, ProductConfig, SetupInfo}; +use proxmox_installer_common::{ + setup::{IsoInfo, ProductConfig, SetupInfo}, + RUNTIME_DIR, +}; use serde::Serialize; -use std::{collections::HashMap, fs, io}; +use std::{collections::HashMap, fs, io, path::PathBuf}; use crate::utils::get_nic_list; @@ -17,7 +20,8 @@ pub struct SysInfo { impl SysInfo { pub fn get() -> Result { - let setup_info: SetupInfo = match fs::File::open("/run/proxmox-installer/iso-info.json") { + 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)? diff --git a/proxmox-chroot/src/main.rs b/proxmox-chroot/src/main.rs index 7885ce7..594f9ab 100644 --- a/proxmox-chroot/src/main.rs +++ b/proxmox-chroot/src/main.rs @@ -1,4 +1,8 @@ -use std::{fs, io, path, process::Command}; +use std::{ + fs, io, + path::{self, PathBuf}, + process::Command, +}; use anyhow::{bail, Result}; use clap::{Args, Parser, Subcommand, ValueEnum}; @@ -6,6 +10,7 @@ use nix::mount::{mount, umount, MsFlags}; use proxmox_installer_common::{ options::FsType, setup::{InstallConfig, SetupInfo}, + RUNTIME_DIR, }; use regex::Regex; @@ -145,8 +150,8 @@ fn get_low_level_config() -> Result { } fn get_iso_info() -> Result { - let file = fs::File::open("/run/proxmox-installer/iso-info.json")?; - let reader = io::BufReader::new(file); + let path = PathBuf::from(RUNTIME_DIR).join("iso-info.json"); + let reader = io::BufReader::new(fs::File::open(path)?); let setup_info: SetupInfo = serde_json::from_reader(reader)?; Ok(setup_info) } diff --git a/proxmox-installer-common/src/lib.rs b/proxmox-installer-common/src/lib.rs index f0093f5..850e825 100644 --- a/proxmox-installer-common/src/lib.rs +++ b/proxmox-installer-common/src/lib.rs @@ -2,3 +2,5 @@ pub mod disk_checks; pub mod options; pub mod setup; pub mod utils; + +pub const RUNTIME_DIR: &str = "/run/proxmox-installer"; diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs index 64d05af..9aa4063 100644 --- a/proxmox-installer-common/src/setup.rs +++ b/proxmox-installer-common/src/setup.rs @@ -161,11 +161,12 @@ pub struct LocaleInfo { /// Fetches basic information needed for the installer which is required to work pub fn installer_setup(in_test_mode: bool) -> Result<(SetupInfo, LocaleInfo, RuntimeInfo), String> { - let base_path = if in_test_mode { "./testdir" } else { "/" }; - let mut path = PathBuf::from(base_path); - - path.push("run"); - path.push("proxmox-installer"); + let base_path = if in_test_mode { + format!("./testdir/{}", crate::RUNTIME_DIR) + } else { + crate::RUNTIME_DIR.to_owned() + }; + let path = PathBuf::from(base_path); let installer_info: SetupInfo = { let mut path = path.clone(); -- 2.45.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel