From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A193067C7D; Fri, 28 Aug 2020 10:47:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 793DB1EED3; Fri, 28 Aug 2020 10:47:10 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DA0131ECF2; Fri, 28 Aug 2020 10:47:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A297744946; Fri, 28 Aug 2020 10:47:06 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 28 Aug 2020 10:46:57 +0200 Message-Id: <20200828084658.22057-9-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200828084658.22057-1-h.laimer@proxmox.com> References: <20200828084658.22057-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record 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: [pve-devel] [PATCH v3 proxmox-backup 8/9] api2: add name of mount-point to DatastoreMountInfo X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 08:47:41 -0000 Signed-off-by: Hannes Laimer --- for the removal of dirs the id/name is needed in the frontend, therefore it has to be returned by the api src/api2/node/disks/directory.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs index 0d9ddeef..1f3cb0ff 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -34,6 +34,8 @@ pub struct DatastoreMountInfo { pub unitfile: String, /// The mount path. pub path: String, + /// The name of the mount. + pub id: String, /// The mounted device. pub device: String, /// File system type @@ -76,6 +78,7 @@ pub fn list_datastore_mounts() -> Result, Error> { let item = item?; let name = item.file_name().to_string_lossy().to_string(); + let id = String::from(MOUNT_NAME_REGEX.captures(&name).unwrap().get(1).map_or("", |m| m.as_str())); let unitfile = format!("{}/{}", basedir, name); let config = systemd::config::parse_systemd_mount(&unitfile)?; let data: SystemdMountSection = config.lookup("Mount", "Mount")?; @@ -84,6 +87,7 @@ pub fn list_datastore_mounts() -> Result, Error> { unitfile, device: data.What, path: data.Where, + id, filesystem: data.Type, options: data.Options, }); -- 2.20.1