[pve-devel] [PATCH installer 03/14] tree-wide: collect hardcoded installer runtime directory strings into constant

[Christoph Heiss <c.heiss@proxmox.com>]

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 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<Self> {
-        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<InstallConfig> {
 }
 
 fn get_iso_info() -> Result<SetupInfo> {
-    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