X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=309e17adea4c3e07e57547d3fc68221c06d07ab0;hb=139998a92ccaebe25b37a2ae5d9fefb2a381ee0a;hp=c068a47b63cd797b5a1607b6a1eb7fc66e20c694;hpb=c2f99cba6866d7e01b23dd01fb1558653951d3d3;p=myplc.git

diff --git a/Makefile b/Makefile
index c068a47..309e17a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,25 @@
-# 
-# $Id$
-#
+##########
+tags:
+	find . -type f | egrep -v '.svn/|~$$' | xargs etags
+
+.PHONY: tags
 
-BINARIES = plc-config plc-config-tty db-config dns-config refresh-peer.py plc-map.py clean-empty-dirs.py mtail.py renew_reminder.py
-INIT_SCRIPTS = api bootcd bootmanager crond db dns functions gpg httpd mail network packages postgresql ssh ssl syslog
+########## sync
+# 2 forms are supported
+# (*) if your plc root context has direct ssh access:
+# make sync PLC=boot.planet-lab.eu
+# (*) otherwise, entering through the root context
+# make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr
 
-INITS=$(addprefix plc.d/,$(INIT_SCRIPTS))
+PLCHOST ?= testplc.onelab.eu
 
-########## make sync PLCHOST=hostname
-ifdef PLCHOST
-PLCSSH:=root@$(PLCHOST)
+ifdef GUEST
+SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
+SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
+endif
+ifdef PLC
+SSHURL:=root@$(PLC):/
+SSHCOMMAND:=ssh root@$(PLC)
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -18,20 +28,28 @@ RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
-ifeq (,$(PLCSSH))
-	echo "sync: You must define target host as PLCHOST on the command line"
-	echo " e.g. make sync PLCHOST=private.one-lab.org" ; exit 1
+ifeq (,$(SSHURL))
+	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
+	@echo "  e.g. make sync PLC=boot.planet-lab.eu"
+	@echo "  or   make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr"
+	@exit 1
 else
-	+$(RSYNC) host.init $(PLCSSH):/etc/init.d/plc
-	+$(RSYNC) guest.init $(PLCSSH):/plc/root/etc/init.d/plc
-	+$(RSYNC) $(BINARIES) $(PLCSSH):/plc/root/usr/bin
-	+$(RSYNC) $(INITS) $(PLCSSH):/plc/root/etc/plc.d
-	+$(RSYNC) plc_config.py $(PLCSSH):/plc/root/usr/lib/python2.4/site-packages/plc_config.py
-	+$(RSYNC) default_config.xml $(PLCSSH):/plc/data/etc/planetlab/default_config.xml
-	@echo XXXXXXXX You might consider running the following command
-	@echo ssh $(PLCSSH) chroot /plc/root service plc start 
+	+$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc
+	+$(RSYNC) bin/ $(SSHURL)/usr/bin/
+	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
+	+$(RSYNC) plc_config.py $(SSHURL)/usr/lib/python2.\*/site-packages/plc_config.py
+	+$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml
+	@echo XXXXXXXX you might need to run ssh root@$(PLC) service plc start 
 endif
 
+#################### convenience, for debugging only
+# make +foo : prints the value of $(foo)
+# make ++foo : idem but verbose, i.e. foo=$(foo)
+++%: varname=$(subst +,,$@)
+++%:
+	@echo "$(varname)=$($(varname))"
++%: varname=$(subst +,,$@)
++%:
+	@echo "$($(varname))"
 
-tags:
-	find . -type f | egrep -v '.svn/|~$$' | xargs etags