X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=5221fa886d32f8e56206958e6a07f5436766746b;hb=ecee05390277f57b02d21ffca0195292bde1defa;hp=78e93b773ee094be651a8c8007e1451bd18b73d6;hpb=3ae0ff6424b515491ab698baa946b33947fac188;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 78e93b7..5221fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
 DATE=$(shell date -u +"%a, %d %b %Y %T")
 force:
 
+debian: DESTDIR=debian/tmp
 debian: forward_api_calls install debian/changelog debian.source debian.package
 
 debian/changelog: debian/changelog.in
@@ -134,8 +135,11 @@ 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
 
 sync:synclxc
 
@@ -151,9 +155,29 @@ else
 	+$(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
+
+# 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