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 50D421FF380 for ; Fri, 19 Apr 2024 17:56:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CEEB0E18D; Fri, 19 Apr 2024 17:56:14 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 19 Apr 2024 17:55:46 +0200 Message-Id: <20240419155606.112010-4-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419155606.112010-1-h.laimer@proxmox.com> References: <20240419155606.112010-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.004 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: [pbs-devel] [PATCH proxmox-backup v8 03/23] disks: add UUID to partition info X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Hannes Laimer --- src/tools/disks/mod.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/tools/disks/mod.rs b/src/tools/disks/mod.rs index 303fe4f1..6227948d 100644 --- a/src/tools/disks/mod.rs +++ b/src/tools/disks/mod.rs @@ -59,6 +59,8 @@ pub struct LsblkInfo { /// File system label. #[serde(rename = "fstype")] file_system_type: Option, + /// File system UUID. + uuid: Option, } impl DiskManage { @@ -617,7 +619,7 @@ pub struct BlockDevStat { /// Use lsblk to read partition type uuids and file system types. pub fn get_lsblk_info() -> Result, Error> { let mut command = std::process::Command::new("lsblk"); - command.args(["--json", "-o", "path,parttype,fstype"]); + command.args(["--json", "-o", "path,parttype,fstype,uuid"]); let output = proxmox_sys::command::run_command(command, None)?; @@ -701,6 +703,8 @@ pub struct PartitionInfo { pub size: Option, /// GPT partition pub gpt: bool, + /// UUID + pub uuid: Option, } #[api( @@ -891,8 +895,10 @@ fn get_partitions_info( let mounted = disk.is_mounted().unwrap_or(false); let mut filesystem = None; + let mut uuid = None; if let (Some(devpath), Some(infos)) = (devpath.as_ref(), lsblk_infos.as_ref()) { for info in infos.iter().filter(|i| i.path.eq(devpath)) { + uuid = info.uuid.clone(); used = match info.partition_type.as_deref() { Some("21686148-6449-6e6f-744e-656564454649") => PartitionUsageType::BIOS, Some("c12a7328-f81f-11d2-ba4b-00a0c93ec93b") => PartitionUsageType::EFI, @@ -915,6 +921,7 @@ fn get_partitions_info( filesystem, size: disk.size().ok(), gpt: disk.has_gpt(), + uuid, } }) .collect() -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel