git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d94fdf
)
fix make sync for the current state of the test infra
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 16 Apr 2014 06:18:41 +0000
(08:18 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 16 Apr 2014 06:18:41 +0000
(08:18 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
ee833d3
..
1d6a0fd
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-15,8
+15,8
@@
SSHURL:=root@$(PLC):/
SSHCOMMAND:=ssh root@$(PLC)
else
ifdef PLCHOSTLXC
SSHCOMMAND:=ssh root@$(PLC)
else
ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/v
ar/lib/lxc/$(GUESTNAME)/rootfs
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC)
ssh $(GUESTHOSTNAME)
+SSHURL:=root@$(PLCHOSTLXC):/v
servers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC)
virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env
else
ifdef PLCHOSTVS
SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
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)
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
##########
endif
##########