1 |
wellsi |
1.1 |
diff -ruN e-smith-backup-2.2.0.old/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.2.0/root/etc/e-smith/events/actions/workstation-backup-dar |
2 |
|
|
--- e-smith-backup-2.2.0.old/root/etc/e-smith/events/actions/workstation-backup-dar 2013-07-07 08:28:45.000000000 -0700 |
3 |
|
|
+++ e-smith-backup-2.2.0/root/etc/e-smith/events/actions/workstation-backup-dar 2013-07-07 08:37:16.000000000 -0700 |
4 |
|
|
@@ -274,7 +274,7 @@ |
5 |
|
|
{ |
6 |
|
|
# removing .dar extension |
7 |
|
|
$ref =~ s/\..*\.dar$//; |
8 |
|
|
- $ref = "--ref " . $setdirname . "/" . $ref; |
9 |
|
|
+ $ref = "--ref|" . $setdirname . "/" . $ref; # | will be used to split this string in run_backup() |
10 |
|
|
$bkname = "inc-" . sprintf("%03d", $incnum) . "-". $bkname; |
11 |
|
|
} |
12 |
|
|
} |
13 |
|
|
@@ -520,7 +520,7 @@ |
14 |
|
|
my $killerpid = undef; |
15 |
|
|
|
16 |
|
|
eval { |
17 |
|
|
- ($pid = open INPUT, "-|", "/usr/bin/dar", "-Q", "--create", "$tmpdir/$id/$bkname", split(/\s+/,$ref), "-B", "/etc/dar/$job.dcf") or ldie("cannot start : $!" ); |
18 |
|
|
+ ($pid = open INPUT, "-|", "/usr/bin/dar", "-Q", "--create", "$tmpdir/$id/$bkname", split(/\|/,$ref), "-B", "/etc/dar/$job.dcf") or ldie("cannot start : $!" ); |
19 |
|
|
|
20 |
|
|
if ($pid) { |
21 |
|
|
$killerpid = start_dar_killer($pid, $timeout); } |