| 1 |
mweinber |
1.1 |
--- smeserver-affa-0.10.0/root/sbin/e-smith/affa.all_option_for_rise 2008-04-04 14:53:46.000000000 +0200 |
| 2 |
|
|
+++ smeserver-affa-0.10.0/root/sbin/e-smith/affa 2008-04-04 14:53:46.000000000 +0200 |
| 3 |
|
|
@@ -38,7 +38,7 @@ |
| 4 |
|
|
|
| 5 |
|
|
$ENV{LANG} = "en_US"; # Filesys::DiskFree only works with english LANG setting |
| 6 |
|
|
|
| 7 |
|
|
-my $VERSION='0.9.0-5'; |
| 8 |
|
|
+my $VERSION='0.10.0-1'; |
| 9 |
|
|
|
| 10 |
|
|
|
| 11 |
|
|
# sub prototypes |
| 12 |
|
|
@@ -189,6 +189,7 @@ |
| 13 |
|
|
"list-archives"=>\$opts{'list-archives'}, |
| 14 |
|
|
"csv"=>\$opts{'csv'}, |
| 15 |
|
|
"rise"=>\$opts{'rise'}, |
| 16 |
|
|
+ "all"=>\$opts{'all'}, |
| 17 |
|
|
"undo-rise"=>\$opts{'undo-rise'}, |
| 18 |
|
|
"full-restore"=>\$opts{'full-restore'}, |
| 19 |
|
|
"send-keys"=>\$opts{'send-keys'}, |
| 20 |
|
|
@@ -791,12 +792,12 @@ |
| 21 |
|
|
if( $job{'remoteHostName'} eq 'localhost' ) |
| 22 |
|
|
{ |
| 23 |
|
|
lg( "signaling pre-backup event on localhost" ); |
| 24 |
|
|
- @cmd=('/sbin/e-smith/signal-event',"pre-backup desktop"); |
| 25 |
|
|
+ @cmd=('/sbin/e-smith/signal-event',"pre-backup"); |
| 26 |
|
|
} |
| 27 |
|
|
else |
| 28 |
|
|
{ |
| 29 |
|
|
lg( "signaling pre-backup event on ". $job{'remoteHostName'} ); |
| 30 |
|
|
- @cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event pre-backup desktop"); |
| 31 |
|
|
+ @cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event pre-backup"); |
| 32 |
|
|
} |
| 33 |
|
|
not ExecCmd( @cmd, 0 ) or affaErrorExit( "signaling pre-backup event failed." ); |
| 34 |
|
|
} |
| 35 |
|
|
@@ -808,12 +809,12 @@ |
| 36 |
|
|
if( $job{'remoteHostName'} eq 'localhost' ) |
| 37 |
|
|
{ |
| 38 |
|
|
lg( "signaling post-backup event on localhost" ); |
| 39 |
|
|
- @cmd=('/sbin/e-smith/signal-event',"post-backup desktop"); |
| 40 |
|
|
+ @cmd=('/sbin/e-smith/signal-event',"post-backup"); |
| 41 |
|
|
} |
| 42 |
|
|
else |
| 43 |
|
|
{ |
| 44 |
|
|
lg( "signaling post-backup event on ". $job{'remoteHostName'} ); |
| 45 |
|
|
- @cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event post-backup desktop"); |
| 46 |
|
|
+ @cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event post-backup"); |
| 47 |
|
|
} |
| 48 |
|
|
not ExecCmd( @cmd, 0 ) or lg( "Error: signaling post-backup event failed." ); |
| 49 |
|
|
} |
| 50 |
|
|
@@ -2176,7 +2177,7 @@ |
| 51 |
|
|
{ |
| 52 |
|
|
(my $archive,my $dest)=@_; |
| 53 |
|
|
my $b = new esmith::Backup or die "Error: Couldn't create Backup object\n"; |
| 54 |
|
|
- my @include = $b->restore_list; |
| 55 |
|
|
+ my @include = $opts{'all'} ? getIncluded() : $b->restore_list; |
| 56 |
|
|
my $txt='Running rsync...'; lg($txt); print "$txt\n"; |
| 57 |
|
|
foreach my $src (@include) |
| 58 |
|
|
{ |
| 59 |
|
|
@@ -2239,7 +2240,7 @@ |
| 60 |
|
|
|
| 61 |
|
|
sub saveMySoul() |
| 62 |
|
|
{ |
| 63 |
|
|
- my $txt = 'Backup the affa server base (this host).'; |
| 64 |
|
|
+ my $txt = 'Backing up the Affa server base (this server).'; |
| 65 |
|
|
print "$txt\n"; lg($txt); |
| 66 |
|
|
my $asb = $affa->get($ServerBasename); |
| 67 |
|
|
$asb->delete() if $asb; |
| 68 |
|
|
@@ -2887,7 +2888,7 @@ |
| 69 |
|
|
print " or affa --send-key JOB\n"; |
| 70 |
|
|
print " or affa --send-key --host=TARGETHOST [--port=PORT] [--remoteOS=cygwin]\n"; |
| 71 |
|
|
print " or affa --full-restore JOB [ARCHIVE]\n"; |
| 72 |
|
|
- print " or affa --rise JOB [ARCHIVE]\n"; |
| 73 |
|
|
+ print " or affa --rise [--all] JOB [ARCHIVE]\n"; |
| 74 |
|
|
print " or affa --undo-rise\n"; |
| 75 |
|
|
print " or affa --list-archives [--csv] [JOB JOB ...]\n"; |
| 76 |
|
|
print " or affa --status [--csv]\n"; |
Parent Directory
| 
Revision Log
| 
Revision Graph
