X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvuseradd;h=65f12cbf2fdf743c302a7091d67ef2e3cb5338f8;hb=56965dbb762db7aa5bb965b0fd443e4138e8bed6;hp=2052c533a1132a637974e694b1c1680d7ccb8176;hpb=bcc732602797b48f0d138a9f6af24af10b0319f9;p=util-vserver.git

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 2052c53..65f12cb 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -2,85 +2,121 @@
 #
 # useradd(8) wrapper for vservers
 #
-# Copyright (c) 2004  The Trustees of Princeton University (Trustees).
+# Mark Huang <mlhuang@cs.princeton.edu>
+# Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: vuseradd,v 1.8 2004/09/22 17:52:28 mlh-pl_kernel Exp $
+# $Id: vuseradd,v 1.26 2006/11/13 18:49:31 mlhuang 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
-
-# automount keys (eval expands ~)
-eval rm -rf ~$NAME/.ssh
-eval ln -nsf /var/pl_sshd/keys/$NAME ~$NAME/.ssh
+# Add slice name to /etc/passwd
+useradd -g slices -s /bin/vsh $NAME -p '*'
 
-USERID=$(awk -F: "\$1 == \"$NAME\" { print \$3 }" < /etc/passwd)
-GROUPID=$(awk -F: "\$1 == \"slices\" { print \$3 }" < /etc/group)
+USERID=`id -u $NAME`
+GROUPID=`id -g $NAME`
+GROUPNAME=`id -gn $NAME`
 
-# create vserver configuration file
-if [ ! -f /etc/vservers/$NAME.conf ] ; then
+# Create /etc/vservers configuration file
+if [ ! -f $__CONFDIR/$NAME.conf ] ; then
     sed \
 	-e "s/.*S_CONTEXT=.*/S_CONTEXT=$USERID/" \
 	-e "s/.*ONBOOT=.*/ONBOOT=yes/" \
-	< $PKGLIBDIR/sample.conf \
-	> /etc/vservers/$NAME.conf
+	< $__PKGLIBDIR/defaults/sample.conf \
+	> $__CONFDIR/$NAME.conf
 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")
+	"$__PKGLIBDIR/vbuild" "$REF" "$TMP"
 	RETVAL=$?
-	# move it to .vcache when complete
-	if [ $RETVAL -ne 0 ] || \
-	   [ $(du -s "$TMP" | awk "{ print \$1 }") -lt \
-             $(du -s "$VROOTDIR/vserver-reference" | awk "{ print \$1 }") ] ; then
-	    echo "Error $RETVAL building $VROOTDIR/$NAME"
-	    rm -rf "$TMP"
-	    exit $RETVAL
+
+	# Move it to its permanent location when complete
+	if [ $RETVAL -eq 0 ] ; then 
+	    mv "$TMP" "$__DEFAULT_VSERVERDIR/$NAME"
 	else
-	    mv "$TMP" "$VROOTDIR/$NAME"
+	    echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME"
+	    rm -rf "$TMP" $__CONFDIR/$NAME.conf $__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_LEGACY $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
+
+exit 0