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 6163F695B8 for ; Mon, 13 Sep 2021 16:18:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F75E2AEA5 for ; Mon, 13 Sep 2021 16:18:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 B44142AE7F for ; Mon, 13 Sep 2021 16:18:30 +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 8BA50447F8 for ; Mon, 13 Sep 2021 16:18:30 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 13 Sep 2021 16:18:27 +0200 Message-Id: <20210913141829.2171301-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913141829.2171301-1-d.csapak@proxmox.com> References: <20210913141829.2171301-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.390 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 v2 5/7] api2: disks/directory: add 'name' property to directory mount listing 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: , X-List-Received-Date: Mon, 13 Sep 2021 14:18:32 -0000 so that we have the properties that match with 'match_all' Signed-off-by: Dominik Csapak --- src/api2/node/disks/directory.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs index c6d230de..ea01352e 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -35,6 +35,8 @@ const BASE_MOUNT_DIR: &str = "/mnt/datastore/"; pub struct DatastoreMountInfo { /// The path of the mount unit. pub unitfile: String, + /// The name of the mount + pub name: String, /// The mount path. pub path: String, /// The mounted device. @@ -83,8 +85,15 @@ pub fn list_datastore_mounts() -> Result, Error> { let config = systemd::config::parse_systemd_mount(&unitfile)?; let data: SystemdMountSection = config.lookup("Mount", "Mount")?; + let name = data + .Where + .strip_prefix(BASE_MOUNT_DIR) + .unwrap_or_else(|| &data.Where) + .to_string(); + list.push(DatastoreMountInfo { unitfile, + name, device: data.What, path: data.Where, filesystem: data.Type, -- 2.30.2