git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
06f7517
)
enable make sync to restart nm only conditionnally
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Mon, 19 May 2014 14:07:28 +0000
(16:07 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Mon, 19 May 2014 14:07:28 +0000
(16:07 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
78e93b7
..
e52e2e9
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-137,6
+137,9
@@
endif
# keep this in sync with setup-vs.spec
LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
# keep this in sync with setup-vs.spec
LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
+# run with make SYNC_RESTART=false if you want to skip restarting nm
+SYNC_RESTART=true
+
sync:synclxc
synclxc: $(NODE).key.rsa
sync:synclxc
synclxc: $(NODE).key.rsa
@@
-151,7
+154,7
@@
else
+$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
# +$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
+$(RSYNC) $(LXC_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
# +$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
-# ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
+ -$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
endif
### fetching the key
endif
### fetching the key