X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=309e17adea4c3e07e57547d3fc68221c06d07ab0;hb=e0343cbb707f100bb22cdb1e4363b24ad8ce09da;hp=82ae384473d69f8aa50c0284791a7bdae0b10a56;hpb=70d06a0b50e8940352eec5844319ad2bcbb04a97;p=myplc.git diff --git a/Makefile b/Makefile index 82ae384..309e17a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,3 @@ -# -# $Id$ -# - ########## tags: find . -type f | egrep -v '.svn/|~$$' | xargs etags @@ -11,9 +7,9 @@ tags: ########## sync # 2 forms are supported # (*) if your plc root context has direct ssh access: -# make sync PLC=private.one-lab.org +# make sync PLC=boot.planet-lab.eu # (*) otherwise, entering through the root context -# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr +# make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr PLCHOST ?= testplc.onelab.eu @@ -34,15 +30,15 @@ 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 " 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) 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