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 F0D811FF13F for ; Thu, 18 Jun 2026 09:49:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CBA25D328; Thu, 18 Jun 2026 09:49:59 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Subject: [PATCH backup 2/2] api: time: rename read_etc_localtime Date: Thu, 18 Jun 2026 09:49:01 +0200 Message-ID: <20260618074926.1464533-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260618074926.1464533-1-m.sandoval@proxmox.com> References: <20260618074926.1464533-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781768908445 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.126 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [time.rs] Message-ID-Hash: ESAXX6DI7HS5SIR5NLND36HZZBCQ6XAX X-Message-ID-Hash: ESAXX6DI7HS5SIR5NLND36HZZBCQ6XAX X-MailFrom: m.sandoval@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The function tries to get the timezone from timedatectl and fallbacks to /etc/localtime, so we rename it to get_timezone. Signed-off-by: Maximiliano Sandoval --- Notes: Whether timedatectl uses /etc/localtime is an implementation detail, but please feel free to drop this commit if it does not add much. src/api2/node/time.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api2/node/time.rs b/src/api2/node/time.rs index 9ab4e84d8..55de0d8ff 100644 --- a/src/api2/node/time.rs +++ b/src/api2/node/time.rs @@ -8,7 +8,7 @@ use proxmox_schema::api; use pbs_api_types::{NODE_SCHEMA, PRIV_SYS_MODIFY, TIME_ZONE_SCHEMA}; -fn read_etc_localtime() -> Result { +fn get_timezone() -> Result { if let Ok(timezone) = timedatectl_get_timezone() { return Ok(timezone); } @@ -118,7 +118,7 @@ fn get_time(_param: Value) -> Result { let localtime = time + offset; Ok(json!({ - "timezone": read_etc_localtime()?, + "timezone": get_timezone()?, "time": time, "localtime": localtime, })) -- 2.47.3