From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 04/23] disks: add UUID to partition info
Date: Fri, 15 Sep 2023 08:54:38 +0200 [thread overview]
Message-ID: <20230915065457.352953-5-h.laimer@proxmox.com> (raw)
In-Reply-To: <20230915065457.352953-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 1cf6385b..7d52e039 100644
--- a/src/tools/disks/mod.rs
+++ b/src/tools/disks/mod.rs
@@ -57,6 +57,8 @@ pub struct LsblkInfo {
/// File system label.
#[serde(rename = "fstype")]
file_system_type: Option<String>,
+ /// File system UUID.
+ uuid: Option<String>,
}
impl DiskManage {
@@ -559,7 +561,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)?;
@@ -643,6 +645,8 @@ pub struct PartitionInfo {
pub size: Option<u64>,
/// GPT partition
pub gpt: bool,
+ /// UUID
+ pub uuid: Option<String>,
}
#[api(
@@ -833,8 +837,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,
@@ -857,6 +863,7 @@ fn get_partitions_info(
filesystem,
size: disk.size().ok(),
gpt: disk.has_gpt(),
+ uuid,
}
})
.collect()
--
2.39.2
next prev parent reply other threads:[~2023-09-15 6:55 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 6:54 [pbs-devel] [PATCH proxmox-backup 00/23] add removable datastores Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 01/23] tools: add disks utility functions Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 02/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 03/23] maintenance: add 'Unpplugged' maintenance type Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-21 7:41 ` Hannes Laimer
2023-09-21 8:16 ` Lukas Wagner
2023-09-15 6:54 ` Hannes Laimer [this message]
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 05/23] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-21 7:50 ` Hannes Laimer
2023-09-21 8:37 ` Lukas Wagner
2023-09-21 8:41 ` Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 06/23] add helper for checking if a removable datastore is available Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 07/23] api2: removable datastore creation Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 08/23] ui: add partition selector form Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 09/23] api2: disks list: add only-unused flag Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 10/23] ui: add removable datastore creation support Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 11/23] ui: add (un)mount button to summary Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 12/23] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 13/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 14/23] ui: display removable datastores in list Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 15/23] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 16/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 17/23] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 18/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 19/23] ui: maintenance: disable edit if unplugged Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 20/23] pb-manager: add (un)mount command Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 21/23] add auto-mounting for removable datastores Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 22/23] api: mark removable datastores as unplugged after restart Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 23/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2023-09-19 13:37 ` [pbs-devel] [PATCH proxmox-backup 00/23] add removable datastores Lukas Wagner
2023-09-19 15:01 ` Thomas Lamprecht
2023-09-19 15:08 ` Lukas Wagner
2023-09-20 10:22 ` Lukas Wagner
2023-09-19 14:03 ` Lukas Wagner
2023-09-19 15:10 ` Lukas Wagner
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=20230915065457.352953-5-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