From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 28 Apr 2014 15:22:23 +0000 (+0200)
Subject: fix make sync in test infra based on lxc containers
X-Git-Tag: sfa-3.1-4~25
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=75c658abdcb20681d688706bb378a3082443e2ef

fix make sync in test infra based on lxc containers
---

diff --git a/Makefile b/Makefile
index 6279ed1f..ddfac30a 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
 SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env
 else
 ifdef PLCHOSTVS
 SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
@@ -194,6 +194,7 @@ syncconfig:
 synctest: synccheck
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 syncrestart: synccheck
+	-$(SSHCOMMAND) systemctl --system daemon-reload
 	$(SSHCOMMAND) service sfa restart
 
 syncmig: