X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=15dacd58c4a59f86912da6ad9b30f71439e82a01;hb=292875d02c96f628a6ca15c0ab82470fb0d7258b;hp=3df59e1e37e20b81a42d2afae2091de497ce7b89;hpb=c37b4dd8e305d2180d85338d34af16328d92f69f;p=lxc-userspace.git

diff --git a/Makefile b/Makefile
index 3df59e1..15dacd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
-all:
-	python setup.py build
+all: vsh setns
+
+vsh: vsh.c
 	gcc vsh.c -o vsh
 
+setns: setns.c
+	python setup.py build
+
 ########## sync
 # for use with the test framework; push local stuff on a test node
 # howto use: go on testmaster in the build you want to use and just run
@@ -35,6 +39,8 @@ ifeq (,$(NODEURL))
 else
 	+$(RSYNC) ./lxcsu ./lxcsu-internal ./vsh.c ./Makefile.vsh $(NODEURL)/usr/sbin/
 	ssh -i $(NODE).key.rsa root@$(NODE) make -C /usr/sbin -f Makefile.vsh vsh
+	ssh -i $(NODE).key.rsa root@$(NODE) chown root:root /usr/sbin/lxcsu /usr/sbin/vsh
+	ssh -i $(NODE).key.rsa root@$(NODE) chmod u+s /usr/sbin/lxcsu /usr/sbin/vsh
 endif
 
 ### fetching the key
@@ -57,3 +63,14 @@ else
 	@echo "FETCHING key"
 	+scp $(KEYURL) $@
 endif
+
+### poor man's install
+
+install: setns vsh
+	mkdir -p /usr/sbin
+	install -D -m 755 vsh /usr/sbin/vsh
+	install -D -m 755 lxcsu /usr/sbin/lxcsu
+	install -D -m 755 lxcsu-internal /usr/sbin/lxcsu-internal
+	chmod u+s /usr/sbin/lxcsu
+	chmod u+s /usr/sbin/vsh
+	cp build/lib*/setns.so /usr/sbin