--- smeserver-affa-0.10.0/root/sbin/e-smith/affa.all_option_for_rise	2008-04-04 14:53:46.000000000 +0200
+++ smeserver-affa-0.10.0/root/sbin/e-smith/affa	2008-04-04 14:53:46.000000000 +0200
@@ -38,7 +38,7 @@
 
 $ENV{LANG} = "en_US"; # Filesys::DiskFree only works with english LANG setting
 
-my $VERSION='0.9.0-5';
+my $VERSION='0.10.0-1';
 
 
 # sub prototypes
@@ -189,6 +189,7 @@
 	"list-archives"=>\$opts{'list-archives'},
 	"csv"=>\$opts{'csv'},
 	"rise"=>\$opts{'rise'},
+	"all"=>\$opts{'all'},
 	"undo-rise"=>\$opts{'undo-rise'},
 	"full-restore"=>\$opts{'full-restore'},
 	"send-keys"=>\$opts{'send-keys'},
@@ -791,12 +792,12 @@
 	if( $job{'remoteHostName'} eq 'localhost' )
 		{
 		lg( "signaling pre-backup event on localhost" );
-		@cmd=('/sbin/e-smith/signal-event',"pre-backup desktop");
+		@cmd=('/sbin/e-smith/signal-event',"pre-backup");
 		}
 	else
 		{
 		lg( "signaling pre-backup event on ". $job{'remoteHostName'} );
-		@cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event pre-backup desktop");
+		@cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event pre-backup");
 		}
 	not ExecCmd( @cmd, 0 ) or affaErrorExit( "signaling pre-backup event failed." );
 	}
@@ -808,12 +809,12 @@
 	if( $job{'remoteHostName'} eq 'localhost' )
 		{
 		lg( "signaling post-backup event on localhost" );
-		@cmd=('/sbin/e-smith/signal-event',"post-backup desktop");
+		@cmd=('/sbin/e-smith/signal-event',"post-backup");
 		}
 	else
 		{
 		lg( "signaling post-backup event on ". $job{'remoteHostName'} );
-		@cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event post-backup desktop");
+		@cmd=('/usr/bin/ssh', '-o', "HostKeyAlias=$jobname", '-p', $job{'sshPort'}, $sshQuiet, $job{'remoteHostName'},"/sbin/e-smith/signal-event post-backup");
 		}
 	not ExecCmd( @cmd, 0 ) or lg( "Error: signaling post-backup event failed." );
 	}
@@ -2176,7 +2177,7 @@
 	{
 	(my $archive,my $dest)=@_;
 	my $b = new esmith::Backup or die "Error: Couldn't create Backup object\n";
-	my @include = $b->restore_list;
+	my @include = $opts{'all'} ? getIncluded() : $b->restore_list;
 	my $txt='Running rsync...'; lg($txt); print "$txt\n";
 	foreach my $src (@include)
 		{
@@ -2239,7 +2240,7 @@
 
 sub saveMySoul()
 	{
-	my $txt = 'Backup the affa server base (this host).';
+	my $txt = 'Backing up the Affa server base (this server).';
 	print "$txt\n"; lg($txt);
 	my $asb = $affa->get($ServerBasename);
 	$asb->delete() if $asb;
@@ -2887,7 +2888,7 @@
 	print "  or   affa --send-key JOB\n";
 	print "  or   affa --send-key --host=TARGETHOST [--port=PORT] [--remoteOS=cygwin]\n";
 	print "  or   affa --full-restore JOB [ARCHIVE]\n";
-	print "  or   affa --rise JOB [ARCHIVE]\n";
+	print "  or   affa --rise [--all] JOB [ARCHIVE]\n";
 	print "  or   affa --undo-rise\n";
 	print "  or   affa --list-archives [--csv] [JOB JOB ...]\n";
 	print "  or   affa --status [--csv]\n";