X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=7a33f11993fab90217ea0ee735556dfa91c2bd64;hb=1daa08914a2d49ebf5e8b49fd4381ce01800bcca;hp=b137434ce21442200165d0e3c4817b46f5b600c8;hpb=f699ab76a8c8a5ba09d2286a833a8a05ecf8564c;p=nodemanager.git

diff --git a/Makefile b/Makefile
index b137434..7a33f11 100644
--- a/Makefile
+++ b/Makefile
@@ -25,25 +25,40 @@ forward_api_calls: forward_api_calls.c
 
 install-lib:
 	python setup-lib.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-scripts=$(DESTDIR)/$(bindir)
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
 install-vs:
 	python setup-vs.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-scripts=$(DESTDIR)/$(bindir)
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
 install-lxc:
 	python setup-lxc.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
-	    --install-scripts=$(DESTDIR)/$(bindir)
+		--install-purelib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-platlib=$(DESTDIR)/$(datadir)/NodeManager \
+		--install-scripts=$(DESTDIR)/$(bindir)
 	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 
+install-scripts: 
+	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
+	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
+	chmod 755 $(DESTDIR)/$(datadir)/sliver-initscripts/
+
+	mkdir -p $(DESTDIR)/etc/init.d
+	chmod 755 initscripts/*
+	rsync -av initscripts/ $(DESTDIR)/etc/init.d/
+
+	install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+
+	install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
+	install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
+
+
 clean:
 	python setup-lib.py clean
 	python setup-vs.py clean
@@ -60,8 +75,17 @@ tags:
 
 ########## sync
 # for use with the test framework; push local stuff on a test node
-# make sync NODE=vnode01.inria.fr
-# specify TESTMASTER and BUILD if the key is not available yet
+# howto use: go on testmaster in the build you want to use and just run
+# $ exp
+# cut'n paste the result in a terminal in your working dir, e.g. (although all are not required)
+# $ export BUILD=2013.07.02--lxc18
+# $ export PLCHOSTLXC=gotan.pl.sophia.inria.fr
+# $ export GUESTNAME=2013.07.02--lxc18-1-vplc01
+# $ export GUESTHOSTNAME=vplc01.pl.sophia.inria.fr
+# $ export KVMHOST=kvm64-6.pl.sophia.inria.fr
+# $ export NODE=vnode01.pl.sophia.inria.fr
+# and then just run
+# $ make sync
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
 RSYNC_EXCLUDES		:= --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
@@ -104,16 +128,3 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
-
-### utility - find out the node name for a given BUILD
-
-ifdef BUILD
-NODEIPCOMMAND:=ssh root@$(TESTMASTER) cat $(BUILD)/arg-ips-node
-endif
-
-nodename:
-ifeq (,$(NODEIPCOMMAND))
-	@echo "nodename: You must define TESTMASTER and BUILD on the command line"
-else
-	$(NODEIPCOMMAND)
-endif