X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=d7ad72e312b272e0e05b474874746bfeadbaa307;hb=9e48893fdb347b1ec1c4006222d045d8ff0fdc8d;hp=ee833d32e24c4c8c04d1f3a35fc5f6c3f1c5a6b4;hpb=135271d073a8e7ddfe044ba62c35bb4f7a4676b0;p=bootmanager.git diff --git a/Makefile b/Makefile index ee833d3..d7ad72e 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ SSHURL:=root@$(PLC):/ SSHCOMMAND:=ssh root@$(PLC) else ifdef PLCHOSTLXC -SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs -SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME) +SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME) +SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME) else ifdef PLCHOSTVS SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME) @@ -42,11 +42,11 @@ ifeq (,$(SSHURL)) else $(SSHCOMMAND) mkdir -p /usr/share/bootmanager/$(DEPLOYMENT) +$(RSYNC) build.sh source $(SSHURL)/usr/share/bootmanager/$(DEPLOYMENT) - $(SSHCOMMAND) service plc start bootmanager + $(SSHCOMMAND) /etc/plc.d/bootmanager start endif ########## tags: - find . -type f | egrep -v 'TAGS|DIFF|/\.svn/|\.git/|~$$' | xargs etags + git ls-files | xargs etags .PHONY: tags