|
Radek Brich |
795e246 |
--- amanda-2.5.2p1/client-src/sendsize.c.xattrs 2007-05-15 20:14:58.000000000 +0200
|
|
Radek Brich |
795e246 |
+++ amanda-2.5.2p1/client-src/sendsize.c 2007-07-12 13:45:29.000000000 +0200
|
|
Radek Brich |
795e246 |
@@ -1863,7 +1863,7 @@ getsize_gnutar(
|
|
Radek Brich |
795e246 |
if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0);
|
|
Radek Brich |
795e246 |
if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0);
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
- my_argv = alloc(SIZEOF(char *) * 22);
|
|
Radek Brich |
795e246 |
+ my_argv = alloc(SIZEOF(char *) * 23);
|
|
Radek Brich |
795e246 |
i = 0;
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR);
|
|
Radek Brich |
795e246 |
@@ -2006,6 +2006,7 @@ getsize_gnutar(
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--atime-preserve";
|
|
Radek Brich |
795e246 |
#endif
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--sparse";
|
|
Radek Brich |
795e246 |
+ my_argv[i++] = "--xattrs";
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--ignore-failed-read";
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--totals";
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
--- amanda-2.5.2p1/client-src/sendbackup-gnutar.c.xattrs 2007-07-12 13:43:28.000000000 +0200
|
|
Radek Brich |
795e246 |
+++ amanda-2.5.2p1/client-src/sendbackup-gnutar.c 2007-07-12 13:45:35.000000000 +0200
|
|
Radek Brich |
795e246 |
@@ -532,7 +532,7 @@ start_backup(
|
|
Radek Brich |
795e246 |
if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0);
|
|
Radek Brich |
795e246 |
if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0);
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
- my_argv = alloc(SIZEOF(char *) * (22 + (nb_exclude*2)+(nb_include*2)));
|
|
Radek Brich |
795e246 |
+ my_argv = alloc(SIZEOF(char *) * (23 + (nb_exclude*2)+(nb_include*2)));
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
cmd = vstralloc(libexecdir, "/", "runtar", versionsuffix(), NULL);
|
|
Radek Brich |
795e246 |
info_tapeheader();
|
|
Radek Brich |
795e246 |
@@ -568,6 +568,7 @@ start_backup(
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--atime-preserve";
|
|
Radek Brich |
795e246 |
#endif
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--sparse";
|
|
Radek Brich |
795e246 |
+ my_argv[i++] = "--xattrs";
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--ignore-failed-read";
|
|
Radek Brich |
795e246 |
my_argv[i++] = "--totals";
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
--- amanda-2.5.2p1/dumper-src/amgtar.pl.in.xattrs 2007-05-04 13:38:51.000000000 +0200
|
|
Radek Brich |
795e246 |
+++ amanda-2.5.2p1/dumper-src/amgtar.pl.in 2007-07-12 12:33:42.000000000 +0200
|
|
Radek Brich |
795e246 |
@@ -150,7 +150,7 @@ sub command_estimate {
|
|
Radek Brich |
795e246 |
sub command_estimate_opt_direct {
|
|
Radek Brich |
795e246 |
my($config, $host, $disk, $device, $level, $listdir) = @_;
|
|
Radek Brich |
795e246 |
my($size) = -1;
|
|
Radek Brich |
795e246 |
- my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
|
|
Radek Brich |
795e246 |
+ my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
|
|
Radek Brich |
795e246 |
#my(@cmd) = ($gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", ".");
|
|
Radek Brich |
795e246 |
print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1);
|
|
Radek Brich |
795e246 |
open3(\*WTRFH, '>&STDOUT', \*ESTIMATE, @cmd);
|
|
Radek Brich |
795e246 |
@@ -215,7 +215,7 @@ print DEBUG "level =" . $level . "\n"
|
|
Radek Brich |
795e246 |
if(defined($opt_index)) {
|
|
Radek Brich |
795e246 |
$verbose = "--verbose";
|
|
Radek Brich |
795e246 |
}
|
|
Radek Brich |
795e246 |
- my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
|
|
Radek Brich |
795e246 |
+ my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
|
|
Radek Brich |
795e246 |
#my(@cmd) = ($gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", ".");
|
|
Radek Brich |
795e246 |
|
|
Radek Brich |
795e246 |
print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1);
|