X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=885da21f2e8e83e7b410f705ae9465ec36640f46;hb=43dda56c871dff1e3077002dbcd231274527c409;hp=2bc03b8f1ab7b3a7bd934db023501ad67b8c0e8d;hpb=36de11f1c6e35ae81eb4774a395f3507cd44feb3;p=plcapi.git diff --git a/Makefile b/Makefile index 2bc03b8..885da21 100644 --- a/Makefile +++ b/Makefile @@ -68,11 +68,6 @@ else ifdef PLCHOSTLXC SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME) SSHCOMMAND:=ssh root@$(PLCHOSTLXC) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env -else -ifdef PLCHOSTVS -SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME) -SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec -endif endif endif @@ -85,8 +80,7 @@ sync: ifeq (,$(SSHURL)) @echo "sync: I need more info from the command line, e.g." @echo " make sync PLC=boot.planetlab.eu" - @echo " make sync PLCHOSTVS=.. GUESTNAME=.." - @echo " make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.." + @echo " make sync PLCHOSTLXC=.. GUESTNAME=.." @exit 1 else +$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/