X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuseradd;h=003426176d573d05b9bdc09cab47f8b691856136;hb=f2817ebba1b80e799049270fefd79836a92fe513;hp=aa1210be9ff07b359fc38d0bcea354b43ed997e3;hpb=73929cd988b29cc673ff12945fc921957bd3ce78;p=util-vserver-pl.git

diff --git a/scripts/vuseradd b/scripts/vuseradd
index aa1210b..0034261 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: vuseradd,v 1.28 2007/07/05 19:05:14 dhozac Exp $
+# $Id$
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
@@ -88,16 +88,16 @@ if [ ! -d $__CONFDIR/$NAME ] ; then
     fi
     mkdir -p $DIR/apps/init $DIR/rlimits $DIR/sched $DIR/dlimits/0
     echo default > $DIR/apps/init/mark
-    echo 1000 > $DIR/rlimits/nproc
+    echo 1000 > $DIR/rlimits/nproc.hard
 
     # Set persistent for the network context
     echo persistent > $DIR/nflags
 
     # Set up the scheduler
-    echo 1000 > $DIR/sched/interval
+    echo 100 > $DIR/sched/interval
     echo 1000 > $DIR/sched/interval2
     echo 0 > $DIR/sched/fill-rate
-    echo 32 > $DIR/sched/fill-rate2
+    echo 1 > $DIR/sched/fill-rate2
     touch $DIR/sched/idle-time
     echo 100 > $DIR/sched/tokens
     echo 50 > $DIR/sched/tokens-min
@@ -109,6 +109,9 @@ if [ ! -d $__CONFDIR/$NAME ] ; then
     echo -1 > $DIR/dlimits/0/inodes_total
     echo -1 > $DIR/dlimits/0/space_total
 
+    # Disable mount namespaces
+    touch $DIR/nonamespace
+
     # Remove the basically empty guest directory
     rm -rf $__DEFAULT_VSERVERDIR/$NAME
     # Move the guest back
@@ -153,9 +156,12 @@ if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
     chmod 755 "$__DEFAULT_VSERVERDIR/$NAME"
 
     # Add user in vserver
-    $_VSERVER ----insecure $NAME suexec root sh -c \
+    $_VSERVER $NAME start --rescue sh -c \
 	"groupadd -g $GROUPID $GROUPNAME ; useradd -u $USERID -g $GROUPID -p '' $NAME"
 
+    # Stop the guest (since it's persistent)
+    $_VSERVER $NAME stop
+
     # Add an unrestricted entry to /etc/sudoers file
     if [ -f "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers" ] && \
        ! grep -q "^$NAME" "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers" ; then