--- /usr/sbin/vzmigrate.orig    2008-01-29 22:00:12.000000000 +0200
+++ /usr/sbin/vzmigrate 2008-01-29 21:59:04.000000000 +0200
@@ -277,6 +277,7 @@
                SSH="ssh $SSH_OPTIONS"
                SCP_OPTIONS="`echo $SSH_OPTIONS | sed 's/-p/-P/1'`"
                SCP="scp $SCP_OPTIONS"
+               export RSYNC_RSH=$SSH
                ;;
        *)
                break

@@ -379,7 +380,7 @@
 
 logexec 2 $SSH root@$host vzctl set $VEID --applyconfig_map name --save
 # vzctl return code 20 or 21 in case of unrecognized option
-if [ $? != 20 && $? != 21 && $? != 0 ]; then
+if [ $? != 20 -a $? != 21 -a $? != 0 ]; then
        log 0 "Failed to apply config on destination node"
        undo_conf
        exit $MIG_ERR_APPLY_CONFIG