X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=cb724a1dba2a799d45b64216ab66803b184a5e6f;hb=21b4f7a59f68f5eb6acbc66f3a1fdc55675e405c;hp=82ae384473d69f8aa50c0284791a7bdae0b10a56;hpb=70d06a0b50e8940352eec5844319ad2bcbb04a97;p=myplc.git

diff --git a/Makefile b/Makefile
index 82ae384..cb724a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,6 @@
-# 
-# $Id$
-#
-
 ##########
 tags:
-	find . -type f | egrep -v '.svn/|~$$' | xargs etags
+	find . -type f | egrep -v '\.git/|~$$' | xargs etags
 
 .PHONY: tags
 
@@ -12,18 +8,23 @@ tags:
 # 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
-
-PLCHOST ?= testplc.onelab.eu
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-ifdef GUEST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+else
+ifdef PLCHOSTVS
+SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
+endif
+endif
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -33,16 +34,17 @@ RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
 ifeq (,$(SSHURL))
-	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
-	@echo "  e.g. make sync PLC=private.one-lab.org"
-	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
+	@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=.."
 	@exit 1
 else
 	+$(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.5/site-packages/plc_config.py
+	+$(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