X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=data%2FPVE%2FAbstractMigrate.pm;h=01d0a50cfa70ce5b3ed36b600ff78ebbe81b7353;hp=6c6061dffb1eb59d9e60c174c9a1c78d103d8d86;hb=3ce640abb3af0319be0ee92660ac4f9b4655741c;hpb=643adc823549aff4023a35610a406bc68c7fff64 diff --git a/data/PVE/AbstractMigrate.pm b/data/PVE/AbstractMigrate.pm index 6c6061d..01d0a50 100644 --- a/data/PVE/AbstractMigrate.pm +++ b/data/PVE/AbstractMigrate.pm @@ -42,7 +42,7 @@ sub cmd { my $logfunc = sub { my $line = shift; - logmsg('info', $line); + $self->log('info', $line); }; $self->log('info', "# " . PVE::Tools::cmd2string($cmd)); @@ -104,11 +104,10 @@ my $eval_int = sub { }; }; -# blowfish is a fast block cipher, much faster then 3des -my @ssh_opts = ('-c', 'blowfish', '-o', 'BatchMode=yes'); +my @ssh_opts = ('-o', 'BatchMode=yes'); my @ssh_cmd = ('/usr/bin/ssh', @ssh_opts); my @scp_cmd = ('/usr/bin/scp', @ssh_opts); -my @rsync_opts = ('-aH', '--delete', '--numeric-ids'); +my @rsync_opts = ('-aHAX', '--delete', '--numeric-ids'); my @rsync_cmd = ('/usr/bin/rsync', @rsync_opts); sub migrate { @@ -134,7 +133,7 @@ sub migrate { local $ENV{RSYNC_RSH} = join(' ', @ssh_cmd); local $SIG{INT} = $SIG{TERM} = $SIG{QUIT} = $SIG{HUP} = $SIG{PIPE} = sub { - logmsg('err', "received interrupt - delayed"); + $self->log('err', "received interrupt - delayed"); $self->{delayed_interrupt} = 1; };