Add support for static vserver IDs (needed for putting pl_conf in a slice)

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 429a959..2be0ac9 100755 (executable)
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuseradd,v 1.20 2004/11/23 14:47:35 mlhuang Exp $
+# $Id: vuseradd,v 1.21 2005/04/26 21:23:28 mlhuang Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -21,19 +21,21 @@ usage()
 }
 
 [ -z "$1" ] && usage
+[ "$1" == "--static" ] && { STATIC=yes; shift; }
 NAME=$1
 
 # add slices group if not already present
 groupadd slices 2>/dev/null || :
 
 # add user
-useradd -g slices -s /bin/vsh $NAME
+[ -z "$STATIC" ] && useradd -g slices -s /bin/vsh $NAME
 
 # openssh-server 3.8 and above refuse login for "locked" accounts
 sed -i -e "s/$NAME:\!\!:\(.*\)/$NAME:*:\1/" /etc/shadow
 
-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
@@ -80,7 +82,7 @@ if [ -d "$VROOTDIR/$NAME" ] ; then
     chmod 755 "$VROOTDIR/$NAME"
 
     # add user in vserver
-    vserver $NAME suexec root groupadd -g $GROUPID slices
+    vserver $NAME suexec root groupadd -g $GROUPID $GROUPNAME
     vserver $NAME suexec root useradd -u $USERID -g $GROUPID -p '' $NAME
 
     # add an unrestricted entry to /etc/sudoers file
@@ -92,3 +94,5 @@ fi
 
 # turn resource management on for vserver $NAME
 service resman start $NAME
+# XXX - resman doesn't print a trailing newline
+echo

diff --git a/scripts/vuserdel b/scripts/vuserdel
index 5cc663e..24d4bd6 100755 (executable)
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
-# $Id: vuserdel,v 1.6 2004/11/23 14:47:35 mlhuang Exp $
+# $Id: vuserdel,v 1.7 2005/04/07 19:37:25 smuir Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars}
@@ -21,6 +21,7 @@ usage()
 }
 
 [ -z "$1" ] && usage
+[ "$1" == "--static" ] && { STATIC=yes; shift; }
 NAME=$1
 
 # read config file to get context ID
@@ -42,9 +43,11 @@ done
 
 # turn resource management off for vserver $NAME
 service resman stop $NAME
+# XXX - resman doesn't print a trailing newline
+echo
 
 # delete user
-userdel -r $NAME
+[ -z "$STATIC" ] && userdel -r $NAME
 
 # remove vserver configuration file
 rm -f /etc/vservers/$NAME.conf

diff --git a/util-vserver.spec b/util-vserver.spec
index dc6d7ba..2e337a3 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,6 +1,6 @@
 %define name util-vserver
 %define version 0.30
-%define release 14.planetlab%{?date:.%{date}}
+%define release 15.planetlab%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -163,6 +163,9 @@ but more readily accessible from Python code.
 
 
 %changelog
+* Thu Jul 28 2005 Steve Muir <smuir@cs.princeton.edu>
+- add support for static vserver IDs to vuseradd and vuserdel
+
 * Thu Jul 21 2005 Steve Muir <smuir@cs.princeton.edu>
 - add bwlimit and cpulimit modules