From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 755CB1FF15C for ; Wed, 4 Sep 2024 16:18:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 411901DF84; Wed, 4 Sep 2024 16:18:43 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 4 Sep 2024 16:11:53 +0200 Message-Id: <20240904141155.350454-25-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240904141155.350454-1-h.laimer@proxmox.com> References: <20240904141155.350454-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [directory.rs] Subject: [pbs-devel] [PATCH proxmox-backup v12 24/26] api: node: include removable datastores in directory list 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/api2/node/disks/directory.rs | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs index cd816414..ed0bd03d 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -45,6 +45,8 @@ pub struct DatastoreMountInfo { pub path: String, /// The mounted device. pub device: String, + /// This is removable + pub removable: bool, /// File system type pub filesystem: Option, /// Mount options @@ -61,7 +63,7 @@ pub struct DatastoreMountInfo { } }, returns: { - description: "List of systemd datastore mount units.", + description: "List of removable-datastore devices and systemd datastore mount units.", type: Array, items: { type: DatastoreMountInfo, @@ -100,6 +102,31 @@ pub fn list_datastore_mounts() -> Result, Error> { path: data.Where, filesystem: data.Type, options: data.Options, + removable: false, + }); + } + + let (config, _digest) = pbs_config::datastore::config()?; + let store_list: Vec = config.convert_to_typed_array("datastore")?; + + for item in store_list + .into_iter() + .filter(|store| store.backing_device.is_some()) + { + let Some(backing_device) = item.backing_device.as_deref() else { + continue; + }; + let Some(mount_point) = item.get_mount_point() else { + continue; + }; + list.push(DatastoreMountInfo { + unitfile: "datastore config".to_string(), + name: item.name.clone(), + device: format!("/dev/disk/by-uuid/{backing_device}"), + path: mount_point, + filesystem: None, + options: None, + removable: true, }); } -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel