X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=c5c719e6138663e77bc7cffe0baafccfed55c243;hb=ccc7b9c4b76a89faad66867b00d16ac45333b6de;hp=6069f413493a0f9141185f03a144c3486d0f0eac;hpb=e1d8605cc9657565449010b1975596af5d7e0c96;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 6069f41..c5c719e 100644
--- a/Makefile
+++ b/Makefile
@@ -135,8 +135,8 @@ NODEURL:=root@$(NODE):/
 endif
 
 # this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
-# keep this in sync with setup-vs.spec
-LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py
+# WARNING: keep this in sync with setup.spec
+LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py --exclude drl.py
 
 # run with make SYNC_RESTART=false if you want to skip restarting nm
 SYNC_RESTART=true
@@ -158,6 +158,26 @@ else
 	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
 endif
 
+# this is for vs only, we need to exclude the lxc stuff that otherwise messes up everything on node
+# xxx keep this in sync with setup.spec
+VS_EXCLUDES= --exclude sliver_libvirt.py --exclude sliver_lxc.py --exclude cgroups.py --exclude coresched_lxc.py --exclude privatebridge.py
+
+syncvs: $(NODE).key.rsa
+ifeq (,$(NODEURL))
+	@echo "syncvs: You must define NODE on the command line"
+	@echo "  e.g. make sync NODE=vnode01.inria.fr"
+	@exit 1
+else
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	@echo WARNING : this target might not be very reliable - use with care
+	@echo xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	+$(RSYNC) $(VS_EXCLUDES) --delete-excluded ./ $(NODEURL)/usr/share/NodeManager/
+	+$(RSYNC) ./initscripts/ $(NODEURL)/etc/init.d/
+#	+$(RSYNC) ./systemd/ $(NODEURL)/usr/lib/systemd/system/
+	-$(SYNC_RESTART) && { ssh -i $(NODE).key.rsa root@$(NODE) service nm restart ; } ||:
+endif
+
+
 ### fetching the key
 
 TESTMASTER ?= testmaster.onelab.eu
@@ -178,3 +198,11 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
+
+########## exp. too
+SLICE=inri_sl1
+
+syncvinit:
+	$(RSYNC) sliver-systemd/vinit.st* $(NODEURL)/vservers/$(SLICE)/usr/bin/
+	$(RSYNC) sliver-systemd/vinit.service $(NODEURL)/vservers/$(SLICE)/usr/lib/systemd/system/
+	echo "remember to run 'systemctl --system daemon-reload' within this slice"