From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B2C241FF15C for ; Wed, 27 Nov 2024 16:22:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B994E1A028; Wed, 27 Nov 2024 16:22:12 +0100 (CET) Mime-Version: 1.0 Date: Wed, 27 Nov 2024 16:21:39 +0100 Message-Id: From: "Shannon Sterz" To: "Proxmox Backup Server development discussion" X-Mailer: aerc 0.18.2-0-ge037c095a049-dirty References: <20241127150658.107034-1-f.ebner@proxmox.com> <20241127150658.107034-2-f.ebner@proxmox.com> In-Reply-To: <20241127150658.107034-2-f.ebner@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 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: Re: [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" On Wed Nov 27, 2024 at 4:06 PM CET, Fiona Ebner wrote: > 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), nit, this could be: ```rs 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!( other than that consider this: Reviewed-by: Shannon Sterz _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel