yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import/export: use our standard tar flags

Browse Source 
Custom plugins may reuse
@PVE::Storage::Plugin::COMMON_TAR_FLAGS as well.
This commit is contained in:
Wolfgang Bumiller
2017-06-22 12:24:39 +02:00
committed by Dietmar Maurer
parent e8a7e764af
commit 766cfd9a87
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PVE/Storage/Plugin.pm
View File

@ -12,6 +12,13 @@ use Data::Dumper;
use base qw(PVE::SectionConfig); use base qw(PVE::SectionConfig);
our @COMMON_TAR_FLAGS = qw(
--one-file-system
-p --sparse --numeric-owner --acls
--xattrs --xattrs-include=user.* --xattrs-include=security.capability
--warning=no-file-ignored --warning=no-xattr-write
);
cfs_register_file ('storage.cfg', cfs_register_file ('storage.cfg',
sub { __PACKAGE__->parse_config(@_); }, sub { __PACKAGE__->parse_config(@_); },
sub { __PACKAGE__->write_config(@_); }); sub { __PACKAGE__->write_config(@_); });
@ -955,7 +962,7 @@ sub volume_export {
} elsif ($format eq 'tar+size') { } elsif ($format eq 'tar+size') {
goto unsupported if $file_format ne 'subvol'; goto unsupported if $file_format ne 'subvol';
write_common_header($fh, $size); write_common_header($fh, $size);
run_command(['tar', '--xform=s,^\./,subvol/,S', '-cf', '-', '-C', $file, '.'], run_command(['tar', @COMMON_TAR_FLAGS, '--xform=s,^\./,subvol/,S', '-cf', '-', '-C', $file, '.'],
output => '>&'.fileno($fh)); output => '>&'.fileno($fh));
return; return;
} }
@ -1023,7 +1030,7 @@ sub volume_import {
run_command(['dd', "of=$file", 'conv=sparse', 'bs=64k'], run_command(['dd', "of=$file", 'conv=sparse', 'bs=64k'],
input => '<&'.fileno($fh)); input => '<&'.fileno($fh));
} elsif ($data_format eq 'tar') { } elsif ($data_format eq 'tar') {
run_command(['tar', '-C', $file, '--xform=s,^subvol/,./,S', '-xf', '-'], run_command(['tar', @COMMON_TAR_FLAGS, '-C', $file, '--xform=s,^subvol/,./,S', '-xf', '-'],
input => '<&'.fileno($fh)); input => '<&'.fileno($fh));
} else { } else {
die "volume import format '$format' not available for $class"; die "volume import format '$format' not available for $class";