X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuseradd;h=f77d58b3bb7f32f2f0165762493956c8367e17d4;hb=e42b91ff38049501d06ec043cf2d49ee43881fb9;hp=0e2c8a0c975ed99daf53ba87a6ba7fcc043b3f0c;hpb=c4ab647140e6387139cb7fd54c43e96fc6981a5c;p=util-vserver-pl.git

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 0e2c8a0..f77d58b 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -88,7 +88,7 @@ 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
@@ -156,14 +156,20 @@ if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
     chmod 755 "$__DEFAULT_VSERVERDIR/$NAME"
 
     # Add user in vserver
-    $_VSERVER ----insecure $NAME suexec root sh -c \
-	"groupadd -g $GROUPID $GROUPNAME ; useradd -u $USERID -g $GROUPID -p '' $NAME"
+    $_VSERVER $NAME start --rescue sh -c \
+	"groupadd -g $GROUPID $GROUPNAME ; useradd -m -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
 	echo "$NAME	ALL=(ALL)	ALL" >> "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers"
     fi
+
+    cp -a /dev/fuse $__DEFAULT_VSERVERDIR/$NAME/dev/
+
 fi
 
 exit 0