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 5E88C1FF173 for ; Mon, 11 Nov 2024 14:15:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 27572B13B; Mon, 11 Nov 2024 14:15:30 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 11 Nov 2024 14:15:00 +0100 Message-ID: <20241111131519.867887-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241111131519.867887-1-c.heiss@proxmox.com> References: <20241111131519.867887-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 v4 04/12] auto-install-assistant: replace `PathBuf` parameters with `AsRef` 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" Signed-off-by: Christoph Heiss --- Changes v3 -> v4: * no changes Changes v2 -> v3: * no changes Changes v1 -> v2: * new patch, suggestion by Stefan proxmox-auto-install-assistant/src/main.rs | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/proxmox-auto-install-assistant/src/main.rs b/proxmox-auto-install-assistant/src/main.rs index 7b8d3ba..746ad84 100644 --- a/proxmox-auto-install-assistant/src/main.rs +++ b/proxmox-auto-install-assistant/src/main.rs @@ -5,7 +5,7 @@ use regex::Regex; use serde::Serialize; use std::{ collections::BTreeMap, - fs, + fmt, fs, io::{self, Read}, path::{Path, PathBuf}, process::{Command, Stdio}, @@ -387,7 +387,12 @@ fn final_iso_location(args: &CommandPrepareISO) -> PathBuf { target.to_path_buf() } -fn inject_file_to_iso(iso: &PathBuf, file: &PathBuf, location: &str, uuid: &String) -> Result<()> { +fn inject_file_to_iso( + iso: impl AsRef + fmt::Debug, + file: &PathBuf, + location: &str, + uuid: &String, +) -> Result<()> { let result = Command::new("xorriso") .arg("-boot_image") .arg("any") @@ -396,7 +401,7 @@ fn inject_file_to_iso(iso: &PathBuf, file: &PathBuf, location: &str, uuid: &Stri .arg("uuid") .arg(uuid) .arg("-dev") - .arg(iso) + .arg(iso.as_ref()) .arg("-map") .arg(file) .arg(location) @@ -410,10 +415,10 @@ fn inject_file_to_iso(iso: &PathBuf, file: &PathBuf, location: &str, uuid: &Stri Ok(()) } -fn get_iso_uuid(iso: &PathBuf) -> Result { +fn get_iso_uuid(iso: impl AsRef) -> Result { let result = Command::new("xorriso") .arg("-dev") - .arg(iso) + .arg(iso.as_ref()) .arg("-report_system_area") .arg("cmd") .output()?; @@ -540,11 +545,11 @@ fn get_nics() -> Result>> { Ok(nics) } -fn get_udev_properties(path: &PathBuf) -> Result { +fn get_udev_properties(path: impl AsRef + fmt::Debug) -> Result { let udev_output = Command::new("udevadm") .arg("info") .arg("--path") - .arg(path) + .arg(path.as_ref()) .arg("--query") .arg("all") .output()?; @@ -554,8 +559,8 @@ fn get_udev_properties(path: &PathBuf) -> Result { Ok(String::from_utf8(udev_output.stdout)?) } -fn parse_answer(path: &PathBuf) -> Result { - let mut file = match fs::File::open(path) { +fn parse_answer(path: impl AsRef + fmt::Debug) -> Result { + let mut file = match fs::File::open(&path) { Ok(file) => file, Err(err) => bail!("Opening answer file {path:?} failed: {err}"), }; -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel