git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge trellis branch to trunk.
[util-vserver-pl.git]
/
scripts
/
vuseradd
diff --git
a/scripts/vuseradd
b/scripts/vuseradd
index
0034261
..
b54aec9
100755
(executable)
--- a/
scripts/vuseradd
+++ b/
scripts/vuseradd
@@
-78,20
+78,21
@@
if [ ! -d $__CONFDIR/$NAME ] ; then
fi
$_VSERVER $NAME build -m skeleton --context $USERID \
fi
$_VSERVER $NAME build -m skeleton --context $USERID \
- --interface nodev:0.0.0.0/0 \
- --flags persistent,~info_init,sched_hard
+ --interface nodev:`hostname -i` \
+ --interface nodev:127.0.0.1 \
+ --flags persistent,~info_init
RETVAL=$?
DIR=$__CONFDIR/$NAME
if [ $RETVAL -ne 0 ] ; then
echo "Error $RETVAL building $DIR"
rm -rf $DIR $__DEFAULT_VSERVERDIR/$NAME
fi
RETVAL=$?
DIR=$__CONFDIR/$NAME
if [ $RETVAL -ne 0 ] ; then
echo "Error $RETVAL building $DIR"
rm -rf $DIR $__DEFAULT_VSERVERDIR/$NAME
fi
- mkdir -p $DIR/apps/init $DIR/rlimits $DIR/sched $DIR/dlimits/0
+ mkdir -p $DIR/apps/init $DIR/rlimits $DIR/sched $DIR/dlimits/0
$DIR/sysctl/0
echo default > $DIR/apps/init/mark
echo 1000 > $DIR/rlimits/nproc.hard
# Set persistent for the network context
echo default > $DIR/apps/init/mark
echo 1000 > $DIR/rlimits/nproc.hard
# Set persistent for the network context
- echo persistent > $DIR/nflags
+ echo persistent
,lback_allow
> $DIR/nflags
# Set up the scheduler
echo 100 > $DIR/sched/interval
# Set up the scheduler
echo 100 > $DIR/sched/interval
@@
-109,9
+110,16
@@
if [ ! -d $__CONFDIR/$NAME ] ; then
echo -1 > $DIR/dlimits/0/inodes_total
echo -1 > $DIR/dlimits/0/space_total
echo -1 > $DIR/dlimits/0/inodes_total
echo -1 > $DIR/dlimits/0/space_total
+ # Set up sysctl variables
+ echo net.ipv4.ip_forward > $DIR/sysctl/0/setting
+ echo 1 > $DIR/sysctl/0/value
+
# Disable mount namespaces
touch $DIR/nonamespace
# Disable mount namespaces
touch $DIR/nonamespace
+ # Add spaces directory
+ mkdir -p $DIR/spaces
+
# Remove the basically empty guest directory
rm -rf $__DEFAULT_VSERVERDIR/$NAME
# Move the guest back
# Remove the basically empty guest directory
rm -rf $__DEFAULT_VSERVERDIR/$NAME
# Move the guest back
@@
-157,7
+165,7
@@
if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
# Add user in vserver
$_VSERVER $NAME start --rescue sh -c \
# Add user in vserver
$_VSERVER $NAME start --rescue sh -c \
- "groupadd -g $GROUPID $GROUPNAME ; useradd -u $USERID -g $GROUPID -p '' $NAME"
+ "groupadd -g $GROUPID $GROUPNAME ; useradd -
m -
u $USERID -g $GROUPID -p '' $NAME"
# Stop the guest (since it's persistent)
$_VSERVER $NAME stop
# Stop the guest (since it's persistent)
$_VSERVER $NAME stop
@@
-167,6
+175,9
@@
if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
! grep -q "^$NAME" "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers" ; then
echo "$NAME ALL=(ALL) ALL" >> "$__DEFAULT_VSERVERDIR/$NAME/etc/sudoers"
fi
! 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
fi
exit 0