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 4483C1FF17C for ; Tue, 16 Dec 2025 19:09:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E7F417348; Tue, 16 Dec 2025 19:10:15 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Tue, 16 Dec 2025 19:08:52 +0100 Message-ID: <20251216180904.270167-3-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251216180904.270167-1-f.schauer@proxmox.com> References: <20251216180904.270167-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1765908573641 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.005 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: [pve-devel] [PATCH container 2/2] mountpoint_insert_staged: inherit attributes if directory already exists X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Make mount points inherit the uid, gid, and access mode if the directory already exists in the container file system. This makes setting up mount points more convenient when attributes different from uid=0, gid=0, mode=755 are required. As an example, this ensures that directories like /app/data and /app/cache in the docker.io/weblate/weblate OCI image retain the correct permissions when adding mount points over them. While not explicitly specified by the OCI spec, this matches the behaviour of implementations such as Docker and Podman. Signed-off-by: Filip Schauer --- src/PVE/LXC.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index e5ff3a1..bf4899f 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -2130,6 +2130,13 @@ sub mountpoint_insert_staged { my $dest_fd = walk_tree_nofollow_fd('/', $rootdir_fd, $mp_dir, 1, $root_uid, $root_gid); + # Preserve attributes of destination directory + my ($mode, $uid, $gid) = (stat($dest_fd))[2, 4, 5]; + PVE::Tools::fchownat(fileno($mount_fd), '', $uid, $gid, PVE::Tools::AT_EMPTY_PATH) + or die "failed to propagate uid and gid to mountpoint: $!\n"; + PVE::Tools::fchmodat(fileno($mount_fd), '.', $mode, 0) + or die "failed to propagate access mode to mountpoint: $!\n"; + PVE::Tools::move_mount( fileno($mount_fd), '', -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel