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

tree-wide: collect hardcoded installer runtime directory strings into constant

Browse Source 
No functional changes.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
Tested-By: Stefan Hanreich <s.hanreich@proxmox.com>
Reviewed-By: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
Christoph Heiss 2024-07-10 15:27:42 +02:00 committed by Thomas Lamprecht
parent dc49f323fa
commit f39ce7ba56
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)?

11
proxmox-chroot/src/main.rs
View File

@ -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)
}

2
proxmox-installer-common/src/lib.rs
View File

@ -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";

11
proxmox-installer-common/src/setup.rs
View File

@ -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();