Skip to content

Commit 0d5905b

Browse files
committed
Reimplement the send/recv code as migrate
I believe some people did use this, but I had intermittent problems getting it to work reliably. It has now been re-implemented as a single "migrate" command using ssh. A guest can now be transferred completely from the source host using a single command. See the man page for more details vm migrate -s guest-name new-host Ideally passwordless key-auth should be used, although not strictly necessary.
1 parent 79f4443 commit 0d5905b

File tree

4 files changed

+204
-167
lines changed

4 files changed

+204
-167
lines changed

lib/vm-base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# POSSIBILITY OF SUCH DAMAGE.
2626

2727
VERSION=1.5-devel
28-
VERSION_INT=105013
28+
VERSION_INT=105015
2929
VERSION_BSD=$(uname -K)
3030
PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
3131

lib/vm-cmd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
CMD_VALID_LIST="init,switch,datastore,image,get,set,list,create,destroy,rename,install,start,stop,restart"
2828
CMD_VALID_LIST="${CMD_VALID_LIST},add,reset,poweroff,startall,stopall,console,iso,img,configure,passthru,_run"
29-
CMD_VALID_LIST="${CMD_VALID_LIST},info,clone,snapshot,rollback,send,recv,version,usage"
29+
CMD_VALID_LIST="${CMD_VALID_LIST},info,clone,snapshot,rollback,migrate,version,usage"
3030

3131
# cmd: vm ...
3232
#
@@ -90,8 +90,7 @@ cmd::parse(){
9090
clone) zfs::clone "$@" ;;
9191
snapshot) zfs::snapshot "$@" ;;
9292
rollback) zfs::rollback "$@" ;;
93-
send) migration::send "$@" ;;
94-
recv) migration::recv "$@" ;;
93+
migrate) migration::run "$@" ;;
9594
*) util::err "unknown command '${_user_cmd}'. please run 'vm usage' or view the manpage for help" ;;
9695
esac
9796
}

0 commit comments

Comments
 (0)