From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 190AB1FF348 for ; Wed, 17 Apr 2024 14:33:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D32EC5CA1; Wed, 17 Apr 2024 14:31:47 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 17 Apr 2024 14:30:47 +0200 Message-Id: <20240417123108.212720-16-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240417123108.212720-1-a.lauterer@proxmox.com> References: <20240417123108.212720-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 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 Subject: [pve-devel] [PATCH installer v6 15/36] auto-installer: add fetch answer binary 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" it is supposed to be run first and fetch an answer file. The initial implementation searches for a partition/filesystem called 'proxmoxinst' or 'PROXMOXINST' with an 'answer.toml' file in the root directory. Once it has an answer file, it will call the 'proxmox-auto-installer' and pipe in the contents via stdin. Tested-by: Christoph Heiss Reviewed-by: Christoph Heiss Signed-off-by: Aaron Lauterer --- Makefile | 4 +- .../src/bin/proxmox-fetch-answer.rs | 71 ++++++++++++++++ .../src/fetch_plugins/mod.rs | 2 + .../src/fetch_plugins/partition.rs | 32 ++++++++ .../src/fetch_plugins/utils.rs | 81 +++++++++++++++++++ proxmox-auto-installer/src/lib.rs | 1 + 6 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs create mode 100644 proxmox-auto-installer/src/fetch_plugins/mod.rs create mode 100644 proxmox-auto-installer/src/fetch_plugins/partition.rs create mode 100644 proxmox-auto-installer/src/fetch_plugins/utils.rs diff --git a/Makefile b/Makefile index 3ac5769..e44450e 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ PREFIX = /usr BINDIR = $(PREFIX)/bin USR_BIN := \ proxmox-tui-installer\ + proxmox-fetch-answer\ proxmox-auto-installer COMPILED_BINS := \ @@ -121,7 +122,8 @@ $(COMPILED_BINS): cargo-build .PHONY: cargo-build cargo-build: $(CARGO) build --package proxmox-tui-installer --bin proxmox-tui-installer \ - --package proxmox-auto-installer --bin proxmox-auto-installer $(CARGO_BUILD_ARGS) + --package proxmox-auto-installer --bin proxmox-auto-installer \ + --bin proxmox-fetch-answer $(CARGO_BUILD_ARGS) %-banner.png: %-banner.svg rsvg-convert -o $@ $< diff --git a/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs b/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs new file mode 100644 index 0000000..a3681a2 --- /dev/null +++ b/proxmox-auto-installer/src/bin/proxmox-fetch-answer.rs @@ -0,0 +1,71 @@ +use anyhow::{anyhow, Error, Result}; +use log::{error, info, LevelFilter}; +use proxmox_auto_installer::{fetch_plugins::partition::FetchFromPartition, log::AutoInstLogger}; +use std::io::Write; +use std::process::{Command, ExitCode, Stdio}; + +static LOGGER: AutoInstLogger = AutoInstLogger; + +pub fn init_log() -> Result<()> { + AutoInstLogger::init("/tmp/fetch_answer.log")?; + log::set_logger(&LOGGER) + .map(|()| log::set_max_level(LevelFilter::Info)) + .map_err(|err| anyhow!(err)) +} + +fn fetch_answer() -> Result { + match FetchFromPartition::get_answer() { + Ok(answer) => return Ok(answer), + Err(err) => info!("Fetching answer file from partition failed: {err}"), + } + // TODO: add more options to get an answer file, e.g. download from url where url could be + // fetched via txt records on predefined subdomain, kernel param, dhcp option, ... + + Err(Error::msg("Could not find any answer file!")) +} + +fn main() -> ExitCode { + if let Err(err) = init_log() { + panic!("could not initialize logging: {err}"); + } + + info!("Fetching answer file"); + let answer = match fetch_answer() { + Ok(answer) => answer, + Err(err) => { + error!("Aborting: {}", err); + return ExitCode::FAILURE; + } + }; + + let mut child = match Command::new("proxmox-auto-installer") + .stdout(Stdio::inherit()) + .stdin(Stdio::piped()) + .stderr(Stdio::null()) + .spawn() + { + Ok(child) => child, + Err(err) => panic!("Failed to start automatic installation: {err}"), + }; + + let mut stdin = child.stdin.take().expect("Failed to open stdin"); + std::thread::spawn(move || { + stdin + .write_all(answer.as_bytes()) + .expect("Failed to write to stdin"); + }); + + match child.wait() { + Ok(status) => { + if status.success() { + ExitCode::SUCCESS + } else { + ExitCode::FAILURE // Will be trapped + } + } + Err(err) => { + error!("Auto installer exited: {err}"); + ExitCode::FAILURE + } + } +} diff --git a/proxmox-auto-installer/src/fetch_plugins/mod.rs b/proxmox-auto-installer/src/fetch_plugins/mod.rs new file mode 100644 index 0000000..11d6937 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/mod.rs @@ -0,0 +1,2 @@ +pub mod partition; +mod utils; diff --git a/proxmox-auto-installer/src/fetch_plugins/partition.rs b/proxmox-auto-installer/src/fetch_plugins/partition.rs new file mode 100644 index 0000000..0c47a62 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/partition.rs @@ -0,0 +1,32 @@ +use anyhow::{Error, Result}; +use std::{fs::read_to_string, path::Path}; +use log::info; + +use crate::fetch_plugins::utils::mount_proxmoxinst_part; + +static ANSWER_FILE: &str = "answer.toml"; + +pub struct FetchFromPartition; + +impl FetchFromPartition { + /// Returns the contents of the answer file + pub fn get_answer() -> Result { + info!("Checking for answer file on partition."); + let mount_path = mount_proxmoxinst_part()?; + let answer = Self::get_answer_file(&mount_path)?; + info!("Found answer file on partition."); + Ok(answer) + } + + /// Searches for answer file and returns contents if found + fn get_answer_file(mount_path: &str) -> Result { + let answer_path = Path::new(mount_path).join(ANSWER_FILE); + match answer_path.try_exists() { + Ok(true) => Ok(read_to_string(answer_path)?), + _ => Err(Error::msg(format!( + "could not find answer file expected at: {}", + answer_path.display() + ))), + } + } +} diff --git a/proxmox-auto-installer/src/fetch_plugins/utils.rs b/proxmox-auto-installer/src/fetch_plugins/utils.rs new file mode 100644 index 0000000..f2a8e74 --- /dev/null +++ b/proxmox-auto-installer/src/fetch_plugins/utils.rs @@ -0,0 +1,81 @@ +use anyhow::{bail, Error, Result}; +use log::{info, warn}; +use std::{ + fs::{self, create_dir_all}, + path::{Path, PathBuf}, + process::Command, +}; + +static ANSWER_MP: &str = "/mnt/answer"; +static PARTLABEL: &str = "proxmoxinst"; +static SEARCH_PATH: &str = "/dev/disk/by-label"; + +/// Searches for upper and lower case existence of the partlabel in the search_path +/// +/// # Arguemnts +/// * `partlabel_source` - Partition Label, used as upper and lower case +/// * `search_path` - Path where to search for the partiiton label +pub fn scan_partlabels(partlabel_source: &str, search_path: &str) -> Result { + let partlabel = partlabel_source.to_uppercase(); + let path = Path::new(search_path).join(&partlabel); + match path.try_exists() { + Ok(true) => { + info!("Found partition with label '{partlabel}'"); + return Ok(path); + } + Ok(false) => info!("Did not detect partition with label '{partlabel}'"), + Err(err) => info!("Encountered issue, accessing '{}': {}", path.display(), err), + } + + let partlabel = partlabel_source.to_lowercase(); + let path = Path::new(search_path).join(&partlabel); + match path.try_exists() { + Ok(true) => { + info!("Found partition with label '{partlabel}'"); + return Ok(path); + } + Ok(false) => info!("Did not detect partition with label '{partlabel}'"), + Err(err) => info!("Encountered issue, accessing '{}': {}", path.display(), err), + } + bail!("Could not detect upper or lower case labels for '{partlabel_source}'"); +} + +/// Will search and mount a partition/FS labeled proxmoxinst in lower or uppercase to ANSWER_MP; +pub fn mount_proxmoxinst_part() -> Result { + if let Ok(true) = check_if_mounted(ANSWER_MP) { + info!("Skipping: '{ANSWER_MP}' is already mounted."); + return Ok(ANSWER_MP.into()); + } + let part_path = scan_partlabels(PARTLABEL, SEARCH_PATH)?; + info!("Mounting partition at {ANSWER_MP}"); + // create dir for mountpoint + create_dir_all(ANSWER_MP)?; + match Command::new("mount") + .args(["-o", "ro"]) + .arg(part_path) + .arg(ANSWER_MP) + .output() + { + Ok(output) => { + if output.status.success() { + Ok(ANSWER_MP.into()) + } else { + warn!("Error mounting: {}", String::from_utf8(output.stderr)?); + Ok(ANSWER_MP.into()) + } + } + Err(err) => Err(Error::msg(format!("Error mounting: {err}"))), + } +} + +fn check_if_mounted(target_path: &str) -> Result { + let mounts = fs::read_to_string("/proc/mounts")?; + for line in mounts.lines() { + if let Some(mp) = line.split(' ').nth(1) { + if mp == target_path { + return Ok(true); + } + } + } + Ok(false) +} diff --git a/proxmox-auto-installer/src/lib.rs b/proxmox-auto-installer/src/lib.rs index 6636cc7..0a153b2 100644 --- a/proxmox-auto-installer/src/lib.rs +++ b/proxmox-auto-installer/src/lib.rs @@ -1,4 +1,5 @@ pub mod answer; +pub mod fetch_plugins; pub mod log; pub mod udevinfo; pub mod utils; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel