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 80E9D1FF15C for ; Wed, 27 Nov 2024 16:07:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7DBEE19D4D; Wed, 27 Nov 2024 16:07:07 +0100 (CET) From: Fiona Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 27 Nov 2024 16:06:57 +0100 Message-Id: <20241127150658.107034-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241127150658.107034-1-f.ebner@proxmox.com> References: <20241127150658.107034-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.055 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 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 1/2] api: disks: directory: factor out helper for mount unit path 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" In preparation to check for a pre-existing mount unit. Signed-off-by: Fiona Ebner --- src/api2/node/disks/directory.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs index 6a76dd5a..7bdf0111 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -324,16 +324,23 @@ pub const ROUTER: Router = Router::new() .post(&API_METHOD_CREATE_DATASTORE_DISK) .match_all("name", &ITEM_ROUTER); +fn datastore_mount_unit_path_info(mount_point: &str) -> (String, String) { + let mut mount_unit_name = proxmox_systemd::escape_unit(mount_point, true); + mount_unit_name.push_str(".mount"); + + ( + format!("/etc/systemd/system/{}", mount_unit_name), + mount_unit_name, + ) +} + fn create_datastore_mount_unit( datastore_name: &str, mount_point: &str, fs_type: FileSystemType, what: &str, ) -> Result { - let mut mount_unit_name = proxmox_systemd::escape_unit(mount_point, true); - mount_unit_name.push_str(".mount"); - - let mount_unit_path = format!("/etc/systemd/system/{}", mount_unit_name); + let (mount_unit_path, mount_unit_name) = datastore_mount_unit_path_info(mount_point); let unit = SystemdUnitSection { Description: format!( -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel