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 72A591FF163 for ; Thu, 7 Nov 2024 17:59:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2641B35AAA; Thu, 7 Nov 2024 17:59:14 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 7 Nov 2024 17:51:39 +0100 Message-Id: <20241107165146.125935-28-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241107165146.125935-1-f.ebner@proxmox.com> References: <20241107165146.125935-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.057 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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] [RFC container v3 27/34] create: factor out tar restore command helper 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" In preparation to re-use it for restore from backup providers. Signed-off-by: Fiona Ebner --- New in v3. src/PVE/LXC/Create.pm | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm index 7c5bf0a..8c8cb9a 100644 --- a/src/PVE/LXC/Create.pm +++ b/src/PVE/LXC/Create.pm @@ -59,12 +59,34 @@ sub restore_proxmox_backup_archive { $scfg, $storeid, $cmd, $param, userns_cmd => $userns_cmd); } -sub restore_tar_archive { - my ($archive, $rootdir, $conf, $no_unpack_error, $bwlimit) = @_; +my sub restore_tar_archive_command { + my ($conf, $opts, $rootdir, $bwlimit) = @_; my ($id_map, $root_uid, $root_gid) = PVE::LXC::parse_id_maps($conf); my $userns_cmd = PVE::LXC::userns_command($id_map); + my $cmd = [@$userns_cmd, 'tar', 'xpf', '-', $opts->@*, '--totals', + @PVE::Storage::Plugin::COMMON_TAR_FLAGS, + '-C', $rootdir]; + + # skip-old-files doesn't have anything to do with time (old/new), but is + # simply -k (annoyingly also called --keep-old-files) without the 'treat + # existing files as errors' part... iow. it's bsdtar's interpretation of -k + # *sigh*, gnu... + push @$cmd, '--skip-old-files'; + push @$cmd, '--anchored'; + push @$cmd, '--exclude' , './dev/*'; + + if (defined($bwlimit)) { + $cmd = [ ['cstream', '-t', $bwlimit*1024], $cmd ]; + } + + return $cmd; +} + +sub restore_tar_archive { + my ($archive, $rootdir, $conf, $no_unpack_error, $bwlimit) = @_; + my $archive_fh; my $tar_input = '<&STDIN'; my @compression_opt; @@ -92,21 +114,7 @@ sub restore_tar_archive { $tar_input = '<&'.fileno($archive_fh); } - my $cmd = [@$userns_cmd, 'tar', 'xpf', '-', @compression_opt, '--totals', - @PVE::Storage::Plugin::COMMON_TAR_FLAGS, - '-C', $rootdir]; - - # skip-old-files doesn't have anything to do with time (old/new), but is - # simply -k (annoyingly also called --keep-old-files) without the 'treat - # existing files as errors' part... iow. it's bsdtar's interpretation of -k - # *sigh*, gnu... - push @$cmd, '--skip-old-files'; - push @$cmd, '--anchored'; - push @$cmd, '--exclude' , './dev/*'; - - if (defined($bwlimit)) { - $cmd = [ ['cstream', '-t', $bwlimit*1024], $cmd ]; - } + my $cmd = restore_tar_archive_command($conf, [@compression_opt], $rootdir, $bwlimit); if ($archive eq '-') { print "extracting archive from STDIN\n"; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel