X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=2ae907148f21b18894bbc830353269e573703c8c;hb=40a15e7c54fd27fa4465aa9db57368964b638738;hp=f6298c40d5457eabf06a2ecf1cd8be29c17a847d;hpb=e3e49243aba5abb3998e9f77937e33230d7f7fd9;p=lxc-userspace.git

diff --git a/Makefile b/Makefile
index f6298c4..2ae9071 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ setns: setns.c
 # $ export NODE=vnode01.pl.sophia.inria.fr
 # and then just run
 # $ make sync
-# this will attempt to compile vsh from vsh.c (and will push Makefile.vsh in /usr/sbin/)
+# this will attempt to compile vsh from vsh.c
 # so you might have to yum install gcc
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
@@ -37,10 +37,14 @@ ifeq (,$(NODEURL))
 	@echo "  e.g. make sync NODE=vnode01.inria.fr"
 	@exit 1
 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
+	+$(RSYNC) ./slicesu ./lxcsu ./lxcsu-internal ./vsh.c $(NODEURL)/usr/sbin/
+	ssh -i $(NODE).key.rsa root@$(NODE) chown root:root /usr/sbin/lxcsu
+	ssh -i $(NODE).key.rsa root@$(NODE) chown root:root /usr/sbin/slicesu
+	ssh -i $(NODE).key.rsa root@$(NODE) chmod u+s /usr/sbin/lxcsu
+	ssh -i $(NODE).key.rsa root@$(NODE) chmod u+s /usr/sbin/slicesu
+	ssh -i $(NODE).key.rsa root@$(NODE) gcc -o /usr/sbin/vsh /usr/sbin/vsh.c
+	ssh -i $(NODE).key.rsa root@$(NODE) chown root:root /usr/sbin/vsh
+	ssh -i $(NODE).key.rsa root@$(NODE) chmod u+s /usr/sbin/vsh
 endif
 
 ### fetching the key
@@ -70,6 +74,9 @@ 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 slicesu /usr/sbin/slicesu
 	install -D -m 755 lxcsu-internal /usr/sbin/lxcsu-internal
 	chmod u+s /usr/sbin/lxcsu
+	chmod u+s /usr/sbin/slicesu
+	chmod u+s /usr/sbin/vsh
 	cp build/lib*/setns.so /usr/sbin