projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Revision update for 2.1.0beta2.
[BackupPC.git]
/
bin
/
BackupPC_restore
diff --git
a/bin/BackupPC_restore
b/bin/BackupPC_restore
index
566673d
..
5843a01
100755
(executable)
--- a/
bin/BackupPC_restore
+++ b/
bin/BackupPC_restore
@@
-1,4
+1,4
@@
-#!/bin/perl
-T
+#!/bin/perl
#============================================================= -*-perl-*-
#
# BackupPC_restore: Restore files to a client.
#============================================================= -*-perl-*-
#
# BackupPC_restore: Restore files to a client.
@@
-29,7
+29,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 2.1.0
_CVS, released 3 Jul 2003
.
+# Version 2.1.0
beta2, released 23 May 2004
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-264,6
+264,7
@@
my $xferArgs = {
pipeWH => *WH,
XferLOG => $RestoreLOG,
XferMethod => $Conf{XferMethod},
pipeWH => *WH,
XferLOG => $RestoreLOG,
XferMethod => $Conf{XferMethod},
+ logLevel => $Conf{XferLogLevel},
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
bkupSrcNum => $RestoreReq{num},
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
bkupSrcNum => $RestoreReq{num},
@@
-332,6
+333,7
@@
if ( $useTar ) {
open(STDERR, ">&STDOUT");
close(STDOUT);
open(STDOUT, ">&WH");
open(STDERR, ">&STDOUT");
close(STDOUT);
open(STDOUT, ">&WH");
+ alarm(0);
exec("$BinDir/BackupPC_tarCreate", @tarArgs);
print(LOG $bpc->timeStamp, "can't exec $BinDir/BackupPC_tarCreate\n");
# FIX: need to cleanup xfer
exec("$BinDir/BackupPC_tarCreate", @tarArgs);
print(LOG $bpc->timeStamp, "can't exec $BinDir/BackupPC_tarCreate\n");
# FIX: need to cleanup xfer
@@
-492,17
+494,17
@@
sub RestoreCleanup
# kill off the tranfer program, first nicely then forcefully
#
if ( @xferPid ) {
# kill off the tranfer program, first nicely then forcefully
#
if ( @xferPid ) {
- kill(
2
, @xferPid);
+ kill(
$bpc->sigName2num("INT")
, @xferPid);
sleep(1);
sleep(1);
- kill(
9
, @xferPid);
+ kill(
$bpc->sigName2num("KILL")
, @xferPid);
}
#
# kill off the tar process, first nicely then forcefully
#
if ( $tarPid > 0 ) {
}
#
# kill off the tar process, first nicely then forcefully
#
if ( $tarPid > 0 ) {
- kill(
2
, $tarPid);
+ kill(
$bpc->sigName2num("INT")
, $tarPid);
sleep(1);
sleep(1);
- kill(
9
, $tarPid);
+ kill(
$bpc->sigName2num("KILL")
, $tarPid);
}
}
}
}