X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=1d6a0fdd67ef9b0b5f6af0709cc0c69cc275d555;hb=fe187578330e8a1e7bef8f873880ede59318d1e9;hp=c2540fad801fe7d36f39554bad99e7c7cf81f731;hpb=68eef50d9f35e3cab248f0212007b84c110cf4cb;p=bootmanager.git

diff --git a/Makefile b/Makefile
index c2540fa..1d6a0fd 100644
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,15 @@
 # $ run export
 # and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
+PLCHOSTLXC ?= lxc64-1.pl.sophia.inria.fr
 
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOST):/var/lib/lxc/$(GUESTNAME)/rootfs
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env 
 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|/\.svn/|\.git/|~$$' | xargs etags
+	find . -type f | egrep -v 'TAGS|DIFF|/\.svn/|\.git/|~$$' | xargs etags
 
 .PHONY: tags