From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v7 03/20] disks: add UUID to partition info
Date: Fri, 19 Apr 2024 10:58:17 +0200 [thread overview]
Message-ID: <20240419085834.32850-4-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240419085834.32850-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
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 68854918..eaf016df 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<String>,
+ /// File system UUID.
+ uuid: Option<String>,
}
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<Vec<LsblkInfo>, 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<u64>,
/// GPT partition
pub gpt: bool,
+ /// UUID
+ pub uuid: Option<String>,
}
#[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
next prev parent reply other threads:[~2024-04-19 8:59 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 8:58 [pbs-devel] [PATCH proxmox-backup v7 00/20] add removable datastores Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 01/20] tools: add disks utility functions Hannes Laimer
2024-04-19 9:54 ` Christian Ebner
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 02/20] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-19 8:58 ` Hannes Laimer [this message]
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 04/20] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-19 9:14 ` Christian Ebner
2024-04-19 15:35 ` Hannes Laimer
2024-04-22 8:23 ` Christian Ebner
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 05/20] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-19 10:21 ` Christian Ebner
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 06/20] api: removable datastore creation Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 07/20] api: disks list: add exclude-used flag Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 08/20] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 09/20] bin: manager: add (un)mount command Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 10/20] add auto-mounting for removable datastores Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 11/20] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 12/20] docs: add removable datastores section Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 13/20] ui: add partition selector form Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 14/20] ui: add removable datastore creation support Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 15/20] ui: add (un)mount button to summary Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 16/20] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 17/20] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 18/20] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 19/20] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-19 8:58 ` [pbs-devel] [PATCH proxmox-backup v7 20/20] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-19 10:10 ` [pbs-devel] [PATCH proxmox-backup v7 00/20] add removable datastores Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240419085834.32850-4-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox