From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 1 Dec 2009 23:24:48 +0000 (+0000)
Subject: Replaced vsh with a C implementation of Andy's replacement for util-vserver-pl. The... 
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dbbdc2eb4467ce3ade17603334a2a9f7f643ba8f;p=util-vserver-pl.git

Replaced vsh with a C implementation of Andy's replacement for util-vserver-pl. The idea is to run the command 'vserver <slice> suexec
<sliceid> /bin/sh'
---

diff --git a/Makefile.am b/Makefile.am
index 32c7ab0..4cb1e63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,8 @@ python_vserverimpl_la_LDFLAGS =	-module -avoid-version
 src_vip6_autod_SOURCES =	src/vip6-autod.c
 src_vip6_autod_LDADD =		-lvserver -lnl
 
+src_vsh_SOURCES =		src/vsh.c
+
 noinst_HEADERS =		src/planetlab.h
 
 man_MANS =			man/vsh.8
@@ -38,10 +40,9 @@ pyexec_DATA =			python/vserver.py \
 sbin_SCRIPTS =			python/bwlimit \
 				python/disklimit \
 				scripts/vuseradd \
-				scripts/vuserdel \
-				scripts/vsh
+				scripts/vuserdel
 
-sbin_PROGRAMS =			
+sbin_PROGRAMS =			src/vsh	
 
 sysv_SCRIPTS =			
 
diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 0d1771b..915c77b 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -97,8 +97,6 @@ rm -fr %{buildroot}
 %{_sysconfdir}/init.d/vip6-autod
 
 %attr(4755,root,root) %{_sbindir}/vsh
-%attr(4755,root,root) %{_sbindir}/vserver_suid_wrapper
-
 /bin/vsh
 %{_mandir}/man8/vsh.8*