git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into lxc_devel - changelog from 2.0-37
[nodemanager.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
08c3acf
..
fb12a5b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-58,7
+58,8
@@
ifeq (,$(NODEURL))
@echo " e.g. make sync NODE=vnode01.inria.fr"
@exit 1
else
@echo " e.g. make sync NODE=vnode01.inria.fr"
@exit 1
else
- +$(RSYNC) ./ $(NODEURL)/usr/share/NodeManager/
+ +$(RSYNC) --exclude sshsh ./ $(NODEURL)/usr/share/NodeManager/
+ +$(RSYNC) ./sshsh $(NODEURL)/bin/
+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
endif
+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
endif
@@
-68,7
+69,7
@@
endif
TESTMASTER ?= testmaster.onelab.eu
ifdef BUILD
TESTMASTER ?= testmaster.onelab.eu
ifdef BUILD
-KEYURL:=root@$(TESTMASTER):$(BUILD)/keys/key
1
.rsa
+KEYURL:=root@$(TESTMASTER):$(BUILD)/keys/key
_admin
.rsa
endif
key: $(NODE).key.rsa
endif
key: $(NODE).key.rsa