From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <c.ebner@proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B58869EEF6 for <pbs-devel@lists.proxmox.com>; Wed, 7 Jun 2023 15:30:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 96B491A2E2 for <pbs-devel@lists.proxmox.com>; Wed, 7 Jun 2023 15:30:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for <pbs-devel@lists.proxmox.com>; Wed, 7 Jun 2023 15:30:52 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4AFB641E9C for <pbs-devel@lists.proxmox.com>; Wed, 7 Jun 2023 15:30:52 +0200 (CEST) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Wed, 7 Jun 2023 15:30:25 +0200 Message-Id: <20230607133027.202575-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 0/2] Introduce bitflags for overwrite X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Wed, 07 Jun 2023 13:30:53 -0000 When restoring a pxar archive to a target containing preexisting data, the `overwrite` flag allows to force recreation of file payloads. However, the current implementation does not allow for symlinks or hardlinks to be recreated. These patches introduce the logic to overwrite symlinks and hardlinks for archive entries, if a directory entry with matching name is already present on the filesystem. An existing entry is unlinked and the symlink/hardlink created. In order to allow a more fine grained control over the overwrite behaviour, the current overwrite flag is refactored to set all bits of a newly introduced bitflag. Further, optional parameters for individual bits controlling the overwriting of files, symlinks and hardlinks are created. Christian Ebner (2): fix: #4761: unlink existing entries for hard/symlinks when overwrite fix: #4761: introduce overwrite bitflags for fine grained overwrites pbs-client/src/catalog_shell.rs | 9 +++- pbs-client/src/pxar/extract.rs | 82 ++++++++++++++++++++++++++----- pbs-client/src/pxar/mod.rs | 2 +- proxmox-backup-client/src/main.rs | 28 ++++++++++- pxar-bin/src/main.rs | 32 +++++++++++- 5 files changed, 135 insertions(+), 18 deletions(-) -- 2.39.2