X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=7769042ae38851749247e158c27478f232f7ac55;hb=bb4b0af7f5c3b030d74f22021e5c3cc20ad17fe1;hp=7cb8a6563e76946d207899f677796ef251d1152f;hpb=80bdfcc459cc296a434306ce2cfd5a52ea3cd14a;p=bootmanager.git

diff --git a/Makefile b/Makefile
index 7cb8a65..7769042 100644
--- a/Makefile
+++ b/Makefile
@@ -2,26 +2,42 @@
 # $Id: Makefile 682 2007-07-19 09:00:25Z thierry $
 #
 
-########## make sync PLCHOST=hostname
-########## make sync PLCHOST=hostname
+########## sync
+# 2 forms are supported
+# (*) if your plc root context has direct ssh access:
+# make sync PLC=private.one-lab.org
+# (*) otherwise, entering through the root context
+# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+
+ifdef GUEST
 ifdef PLCHOST
-ifdef VSERVER
-PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER)
+SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
+SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
+endif
 endif
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
 endif
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude debug_root_ssh_key
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
 RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+DEPLOYMENT ?= regular
+
 sync:
-ifeq (,$(PLCSSH))
-	echo "sync: You must define PLCHOST and VSERVER on the command line"
-	echo " e.g. make sync PLCHOST=private.one-lab.org VSERVER=myplc01" ; exit 1
+ifeq (,$(SSHURL))
+	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
+	@echo " you can optionnally define DEPLOYMENT too, it defaults to 'regular'"
+	@echo "  e.g. make sync PLC=boot.onelab.eu DEPLOYMENT=alpha"
+	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
+	@exit 1
 else
-	+$(RSYNC) source $(PLCSSH)/usr/share/bootmanager/
-	ssh root@$(PLCHOST) vserver $(VSERVER) exec service plc start bootmanager
+	$(SSHCOMMAND) mkdir -p /usr/share/bootmanager/$(DEPLOYMENT)
+	+$(RSYNC) build.sh source $(SSHURL)/usr/share/bootmanager/$(DEPLOYMENT)
+	$(SSHCOMMAND) service plc start bootmanager
 endif
 
 ##########