fix coresched locating cgroup and reduce verbosity

[nodemanager.git] / Makefile

diff --git a/Makefile b/Makefile
index 0bea07a..c5c719e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,18 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-# call with either WITH_SYSTEMD=true or WITH_INIT=true
 initdir=/etc/rc.d/init.d
 systemddir := /usr/lib/systemd/system
 
+# call with either WITH_SYSTEMD=true or WITH_INIT=true
+# otherwise we try to guess some reasonable default
+ifeq "$(WITH_INIT)$(WITH_SYSTEMD)" ""
+ifeq "$(wildcard $systemddir/*)" ""
+WITH_INIT=true
+else
+WITH_SYSTEMD=true
+endif
+endif
 ####################
 all: forward_api_calls
        python setup.py build
@@ -80,7 +88,8 @@ DEBTARBALL=../$(RPMNAME)_$(DEBVERSION).orig.tar.bz2
 DATE=$(shell date -u +"%a, %d %b %Y %T")
 force:
 
-debian: debian/changelog debian.source debian.package
+debian: DESTDIR=debian/tmp
+debian: forward_api_calls install debian/changelog debian.source debian.package
 
 debian/changelog: debian/changelog.in
        sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
@@ -126,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
 
@@ -143,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
@@ -166,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"