From: Thierry Parmentelat Date: Wed, 16 Apr 2014 06:18:41 +0000 (+0200) Subject: fix make sync for the current state of the test infra X-Git-Tag: bootmanager-5.2-5~1^2~1^2~1 X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=2eb0e04f35300baecc8df0312d4541d4078e43cc fix make sync for the current state of the test infra --- diff --git a/Makefile b/Makefile index ee833d3..1d6a0fd 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) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env else ifdef PLCHOSTVS SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME) @@ -42,7 +42,7 @@ 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 ##########