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 634E120EC7F for ; Tue, 23 Apr 2024 10:30:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 861371D5E0; Tue, 23 Apr 2024 10:30:43 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 23 Apr 2024 10:29:58 +0200 Message-Id: <20240423083000.28002-25-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240423083000.28002-1-h.laimer@proxmox.com> References: <20240423083000.28002-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 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 v9 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 | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs index 34304216..f7e4a1a3 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -43,6 +43,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 @@ -59,7 +61,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, @@ -99,6 +101,28 @@ 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()) + { + list.push(DatastoreMountInfo { + unitfile: "datastore config".to_string(), + name: item.name.clone(), + device: format!( + "/dev/disk/by-uuid/{}", + item.backing_device.as_ref().unwrap_or(&"none".to_string()) + ), + path: item.get_mount_point().unwrap_or("none".to_string()), + filesystem: None, + options: None, + removable: item.backing_device.is_some(), }); } -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel