From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 2C7581FF13E for ; Wed, 01 Jul 2026 16:05:19 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 6D12021495; Wed, 01 Jul 2026 16:05:07 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v3 14/15] tape: use proxmox-product-config to generate create options Date: Wed, 1 Jul 2026 16:04:11 +0200 Message-ID: <20260701140412.200920-15-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260701140412.200920-1-c.ebner@proxmox.com> References: <20260701140412.200920-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782914663151 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 23UTMQ2VIHMWSNTCO4VYLN57LAQKPSFO X-Message-ID-Hash: 23UTMQ2VIHMWSNTCO4VYLN57LAQKPSFO X-MailFrom: c.ebner@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: Instead of redefining them, use the global helper defined in proxmox-product-config. Requires the crates init function to be called exactly once before using in any callpath. Signed-off-by: Christian Ebner --- src/tape/inventory.rs | 6 +----- src/tape/media_catalog_cache.rs | 10 +--------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/tape/inventory.rs b/src/tape/inventory.rs index 6c54738fb..12cca02c6 100644 --- a/src/tape/inventory.rs +++ b/src/tape/inventory.rs @@ -177,11 +177,7 @@ impl Inventory { // We cannot use chown inside test environment (no permissions) CreateOptions::new().perm(mode) } else { - let backup_user = pbs_config::backup_user()?; - CreateOptions::new() - .perm(mode) - .owner(backup_user.uid) - .group(backup_user.gid) + proxmox_product_config::default_create_options() }; replace_file(&self.inventory_path, raw.as_bytes(), options, true)?; diff --git a/src/tape/media_catalog_cache.rs b/src/tape/media_catalog_cache.rs index 131d31d66..bb821109d 100644 --- a/src/tape/media_catalog_cache.rs +++ b/src/tape/media_catalog_cache.rs @@ -3,8 +3,6 @@ use std::path::Path; use anyhow::{Error, bail, format_err}; -use proxmox_sys::fs::CreateOptions; - use crate::tape::{MediaCatalog, MediaId}; /// Returns a list of (store, snapshot) for a given MediaId @@ -93,13 +91,7 @@ fn write_snapshot_cache>( } } - let backup_user = pbs_config::backup_user()?; - let mode = nix::sys::stat::Mode::from_bits_truncate(0o0640); - let options = CreateOptions::new() - .perm(mode) - .owner(backup_user.uid) - .group(backup_user.gid); - + let options = proxmox_product_config::default_create_options(); proxmox_sys::fs::replace_file(cache_path, data.as_bytes(), options, false)?; Ok(list) -- 2.47.3