X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=blobdiff_plain;f=scripts%2Fvuseradd;h=90adf26f9e909a9f181eb7dd6316605ac5f4e987;hp=af4c4676f0b1a6492242a8cac3d3a9e21da31bfd;hb=ec4370f7ebd7fb0ce7f002f5bf2c74f03acd3ec1;hpb=745da7fd414303936df07cf6744a858e13794e85 diff --git a/scripts/vuseradd b/scripts/vuseradd index af4c467..90adf26 100755 --- a/scripts/vuseradd +++ b/scripts/vuseradd @@ -2,95 +2,164 @@ # # useradd(8) wrapper for vservers # -# Copyright (c) 2004 The Trustees of Princeton University (Trustees). +# Mark Huang +# Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: vuseradd,v 1.16 2004/11/12 18:44:09 mef Exp $ +# $Id: vuseradd,v 1.31 2007/07/05 17:36:42 dhozac Exp $ # -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { echo "Can not find util-vserver installation; aborting..." exit 1 } . "$UTIL_VSERVER_VARS" +shopt -s nullglob + +# Defaults +TYPE="default" + usage() { - echo "usage: $0 name" + TYPES= + pushd "$__DEFAULT_VSERVERDIR/.vref" >/dev/null + for ref in * ; do + if [ -z "$TYPES" ] ; then + TYPES=$ref + else + TYPES="$TYPES, $ref" + fi + done + popd >/dev/null + + echo "Usage: vuseradd [OPTION]... [NAME]" + echo " -t Reference image type ($TYPES)" exit 1 } +# Get options +while getopts "t:" opt ; do + case $opt in + t) + TYPE="$OPTARG" + ;; + *) + usage + ;; + esac +done +shift $(($OPTIND - 1)) + +# Get slice name [ -z "$1" ] && usage NAME=$1 -# add slices group if not already present +# Add slices group to /etc/group if not already present groupadd slices 2>/dev/null || : -# add user -useradd -g slices -s /bin/vsh $NAME +# Add slice name to /etc/passwd +useradd -g slices -s /bin/vsh $NAME -p '*' + +USERID=`id -u $NAME` +GROUPID=`id -g $NAME` +GROUPNAME=`id -gn $NAME` + +# Create /etc/vservers configuration files +if [ ! -d $__CONFDIR/$NAME ] ; then + # Move away the guest contents for now + if [ -d $__DEFAULT_VSERVERDIR/$NAME ] ; then + mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp" + TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX") + mv $__DEFAULT_VSERVERDIR/$NAME "$TMP" + HAS_VSERVERDIR=1 + else + HAS_VSERVERDIR=0 + fi + + $_VSERVER $NAME build -m skeleton --context $USERID \ + --interface nodev:0.0.0.0/0 \ + --flags persistent,~info_init,sched_hard + 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 + echo default > $DIR/apps/init/mark + echo 1000 > $DIR/rlimits/nproc + + # Set persistent for the network context + echo persistent > $DIR/nflags + + # Set up the scheduler + echo 1000 > $DIR/sched/interval + echo 1000 > $DIR/sched/interval2 + echo 0 > $DIR/sched/fill-rate + echo 32 > $DIR/sched/fill-rate2 + touch $DIR/sched/idle-time + echo 100 > $DIR/sched/tokens + echo 50 > $DIR/sched/tokens-min + echo 100 > $DIR/sched/tokens-max -USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd) -GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group) + # Set up disk limits (unlimited) + echo `$_READLINK $DIR/vdir` > $DIR/dlimits/0/directory + echo 2 > $DIR/dlimits/0/reserved + echo -1 > $DIR/dlimits/0/inodes_total + echo -1 > $DIR/dlimits/0/space_total -# create vserver configuration file -if [ ! -f /etc/vservers/$NAME.conf ] ; then - sed \ - -e "s/.*S_CONTEXT=.*/S_CONTEXT=$USERID/" \ - -e "s/.*ONBOOT=.*/ONBOOT=yes/" \ - < $PKGLIBDIR/sample.conf \ - > /etc/vservers/$NAME.conf + # Remove the basically empty guest directory + rm -rf $__DEFAULT_VSERVERDIR/$NAME + # Move the guest back + if [ "$HAS_VSERVERDIR" = 1 ] ; then + mv "$TMP" $__DEFAULT_VSERVERDIR/$NAME + fi fi -if [ ! -d "$VROOTDIR/$NAME" ] ; then - # check the cache - shopt -s nullglob - for i in "$VROOTDIR/.vcache/"* ; do - [ -d "$i" ] && mv "$i" "$VROOTDIR/$NAME" && break - done - # build vserver - if [ ! -d "$VROOTDIR/$NAME" ] ; then - # build image in .vtmp - TMP=$(mktemp -d "$VROOTDIR/.vtmp/$NAME.XXXXXX") - "$PKGLIBDIR/vbuild" "$VROOTDIR/vserver-reference" "$TMP" +if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then + # Check the cache + if [ "$TYPE" = "default" ] ; then + for i in "$__DEFAULT_VSERVERDIR/.vcache/"* ; do + [ -d "$i" ] && mv "$i" "$__DEFAULT_VSERVERDIR/$NAME" && break + done + fi + + # Build slice from reference image + if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then + REF="$__DEFAULT_VSERVERDIR/.vref/$TYPE" + + # Build in temporary directory + mkdir -p "$__DEFAULT_VSERVERDIR/.vtmp" + TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/$NAME.XXXXXX") + "$_VCLONE" "$REF"/ "$TMP"/ RETVAL=$? - # move it to .vcache when complete - if [ $RETVAL -ne 0 ] ; then - echo "Error $RETVAL building $VROOTDIR/$NAME" - chattr -R -i "$TMP" - rm -rf "$TMP" - userdel $NAME - exit $RETVAL + + # Move it to its permanent location when complete + if [ $RETVAL -eq 0 ] ; then + mv "$TMP" "$__DEFAULT_VSERVERDIR/$NAME" else - # sanity check - vnewsize=$(du -s "$TMP" | awk "{ print \$1 }") - vrefsize=$(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }") - if [ $vnewsize -lt $vrefsize ] ; then - echo "Error 'du -s $VROOTDIR/$NAME'=$vnewsize < 'du -s $VROOTDIR/vserver-reference'=$vrefsize" - chattr -R -i "$TMP" - rm -rf "$TMP" - userdel $NAME - exit 256 - fi - - mv "$TMP" "$VROOTDIR/$NAME" + echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME" + rm -rf "$TMP" $__CONFDIR/$NAME $__PKGSTATEDIR/$NAME.ctx + userdel -r $NAME + exit $RETVAL fi fi fi -if [ -d "$VROOTDIR/$NAME" ] ; then - # fix permissions - chmod 755 "$VROOTDIR/$NAME" +if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then + # Fix permissions + chmod 755 "$__DEFAULT_VSERVERDIR/$NAME" - # add user in vserver - vserver $NAME suexec root groupadd -g $GROUPID slices - vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME + # Add user in vserver + $_VSERVER ----insecure $NAME suexec root sh -c \ + "groupadd -g $GROUPID $GROUPNAME ; useradd -u $USERID -g $GROUPID -p '' $NAME" - # add an unrestricted entry to /etc/sudoers file - if [ -f "$VROOTDIR/$NAME/etc/sudoers" ] && \ - ! grep -q "^$NAME" "$VROOTDIR/$NAME/etc/sudoers" ; then - echo "$NAME ALL=(ALL) ALL" >> "$VROOTDIR/$NAME/etc/sudoers" + # 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 fi -# turn resource management on for vserver $NAME -service resman start $NAME +exit 0