This commit was manufactured by cvs2svn to create tag

'before-util-vserver-0_30_212-merge'.

diff --git a/Makefile.am b/Makefile.am
index 758a67c..068605c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,10 +241,10 @@ nodist_lib_dietlibc_not_enabled_error_a_SOURCES = \
 endif
 
 install-exec-hook:
-       cd $(DESTDIR)$(sbindir) && $(LN_S) vuseradd vadduser
-       cd $(DESTDIR)$(sbindir) && $(LN_S) vuserdel vdeluser
+       cd $(DESTDIR)$(sbindir) && $(LN_S)f vuseradd vadduser
+       cd $(DESTDIR)$(sbindir) && $(LN_S)f vuserdel vdeluser
        mkdir -p $(DESTDIR)/bin
-       cd $(DESTDIR)/bin && $(LN_S) ../$(sbindir)/vsh
+       cd $(DESTDIR)/bin && $(LN_S)f ../$(sbindir)/vsh
 
 install-data-hook:
        install -D -m 644 scripts/vcached.logrotate $(DESTDIR)/$(sysconfdir)/logrotate.d/vcached

diff --git a/python/bwlimit.py b/python/bwlimit.py
index 5f35fe8..5c1716e 100644 (file)
--- a/python/bwlimit.py
+++ b/python/bwlimit.py
@@ -46,7 +46,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: bwlimit.py,v 1.11 2006/03/15 16:41:21 smuir Exp $
+# $Id: bwlimit.py,v 1.13 2006/11/27 22:32:59 mlhuang Exp $
 #
 
 import sys, os, re, getopt
@@ -303,14 +303,17 @@ def tc(cmd):
     return run(TC + " " + cmd)
 
 
-def init(dev, bwcap):
+def init(dev = dev, bwcap = bwmax):
     """
     (Re)initialize the bandwidth limits on this node
     """
 
-    # load the module used to manage exempt classes
+    # Load the module used to manage exempt classes
     run("/sbin/modprobe ip_set_iphash")
 
+    # Save current settings
+    paramslist = get(None, dev)
+
     # Delete root qdisc 1: if it exists. This will also automatically
     # delete any child classes.
     for line in tc("qdisc show dev %s" % dev):
@@ -352,6 +355,14 @@ def init(dev, bwcap):
     # up here.
     on(default_xid, dev, share = default_share)
 
+    # Restore old settings
+    for (xid, share,
+         minrate, maxrate,
+         minexemptrate, maxexemptrate,
+         bytes, exemptbytes) in paramslist:
+        if xid not in (root_xid, default_xid):
+            on(xid, dev, share, minrate, maxrate, minexemptrate, maxexemptrate)
+
 
 def get(xid = None, dev = dev):
     """
@@ -497,8 +508,12 @@ def on(xid, dev = dev, share = None, minrate = None, maxrate = None, minexemptra
         maxexemptrate = get_tc_rate(maxexemptrate)
 
     # Sanity checks
+    if maxrate < bwmin:
+        maxrate = bwmin
     if maxrate > bwcap:
         maxrate = bwcap
+    if minrate < bwmin:
+        minrate = bwmin
     if minrate > maxrate:
         minrate = maxrate
     if maxexemptrate > bwmax:

diff --git a/python/vserver.py b/python/vserver.py
index 81e5203..c6d07b6 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -86,11 +86,13 @@ class VServer:
         f.close()
         todo = newvars.copy()
         changed = False
+        offset = 0
         for m in self.config_var_re.finditer(data):
             (key, val) = m.groups()
             newval = todo.pop(key, None)
             if newval != None:
-                data = data[:m.start(2)] + str(newval) + data[m.end(2):]
+                data = data[:offset+m.start(2)] + str(newval) + data[offset+m.end(2):]
+                offset += len(str(newval)) - (m.end(2)-m.start(2))
                 changed = True
         for (newkey, newval) in todo.items():
             data += "%s=%s\n" % (newkey, newval)

diff --git a/scripts/vcached b/scripts/vcached
index 570a1db..c587bc1 100755 (executable)
--- a/scripts/vcached
+++ b/scripts/vcached
@@ -16,7 +16,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (c) 2004-2005 The Trustees of Princeton University
 #
-# $Id: vcached,v 1.11 2005/08/21 21:37:10 mlhuang Exp $
+# $Id: vcached,v 1.12 2005/09/03 21:47:11 mlhuang Exp $
 #
 
 PATH=/sbin:/usr/sbin:$PATH
@@ -90,17 +90,10 @@ for i in $(seq 0 $(($slots - 1))) ; do
        echo "$(date) Caching v$i"
        # build image in .vtmp
        TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.vtmp/v$i.XXXXXX")
-       "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
+       "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/.vref/default" "$TMP"
        RETVAL=$?
        # move it to .vcache when complete
        if [ $RETVAL -eq 0 ] ; then
-           # sanity check
-           vnewsize=$(du -s "$TMP" | awk "{ print \$1 }")
-           vrefsize=$(du -s "$__DEFAULT_VSERVERDIR/vserver-reference" | awk "{ print \$1 }")
-           if [ $vnewsize -lt $vrefsize ] ; then
-               echo "WARNING: Unexpected for 'du -s $__DEFAULT_VSERVERDIR/$NAME'=$vnewsize to be less than 'du -s $__DEFAULT_VSERVERDIR/vserver-reference'=$vrefsize"
-           fi
-
            mv "$TMP" "$__DEFAULT_VSERVERDIR/.vcache/v$i"
            echo "$(date) v$i ready"
        else

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 3a531f3..65f12cb 100755 (executable)
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -2,9 +2,10 @@
 #
 # 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.24 2005/09/02 20:00:39 mlhuang Exp $
+# $Id: vuseradd,v 1.26 2006/11/13 18:49:31 mlhuang Exp $
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
@@ -14,32 +15,57 @@ test -e "$UTIL_VSERVER_VARS" || {
 }
 . "$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
-[ "$1" == "--static" ] && { STATIC=yes; shift; }
 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
-[ -z "$STATIC" ] && useradd -g slices -s /bin/vsh $NAME
-
-# openssh-server 3.8 and above refuse login for "locked" accounts
-for file in /etc/passwd /etc/shadow ; do
-    [ -f $file ] && sed -i -e "s/$NAME:\!\!:\(.*\)/$NAME:*:\1/" $file
-done
+# 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 vserver configuration file
+# Create /etc/vservers configuration file
 if [ ! -f $__CONFDIR/$NAME.conf ] ; then
     sed \
        -e "s/.*S_CONTEXT=.*/S_CONTEXT=$USERID/" \
@@ -49,47 +75,48 @@ if [ ! -f $__CONFDIR/$NAME.conf ] ; then
 fi
 
 if [ ! -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
-    # check the cache
-    shopt -s nullglob
-    for i in "$__DEFAULT_VSERVERDIR/.vcache/"* ; do
-       [ -d "$i" ] && mv "$i" "$__DEFAULT_VSERVERDIR/$NAME" && break
-    done
-    # build vserver
+    # 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
-       # build in temporary directory
-       TMP=$(mktemp -d "$__DEFAULT_VSERVERDIR/.$NAME.XXXXXX")
-       "$__PKGLIBDIR/vbuild" "$__DEFAULT_VSERVERDIR/vserver-reference" "$TMP"
+       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 its permanent location when complete
-       if [ $RETVAL -ne 0 ] ; then 
+
+       # Move it to its permanent location when complete
+       if [ $RETVAL -eq 0 ] ; then 
+           mv "$TMP" "$__DEFAULT_VSERVERDIR/$NAME"
+       else
            echo "Error $RETVAL building $__DEFAULT_VSERVERDIR/$NAME"
            rm -rf "$TMP" $__CONFDIR/$NAME.conf $__PKGSTATEDIR/$NAME.ctx
            userdel -r $NAME
            exit $RETVAL
-       else
-           # sanity check
-           vnewsize=$(du -s "$TMP" | awk "{ print \$1 }")
-           vrefsize=$(du -s "$__DEFAULT_VSERVERDIR/vserver-reference" | awk "{ print \$1 }")
-           if [ $vnewsize -lt $vrefsize ] ; then
-               echo "WARNING: Unexpected for 'du -s $__DEFAULT_VSERVERDIR/$NAME'=$vnewsize to be less than 'du -s $__DEFAULT_VSERVERDIR/vserver-reference'=$vrefsize"
-           fi
-
-           mv "$TMP" "$__DEFAULT_VSERVERDIR/$NAME"
        fi
     fi
 fi
 
 if [ -d "$__DEFAULT_VSERVERDIR/$NAME" ] ; then
-    # fix permissions
+    # Fix permissions
     chmod 755 "$__DEFAULT_VSERVERDIR/$NAME"
 
-    # add user in vserver
+    # 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
+    # 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

diff --git a/util-vserver.spec b/util-vserver.spec
index 92bf914..7373d5b 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -17,7 +17,7 @@
 
 %define name util-vserver
 %define version 0.30.208
-%define release 13%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 15%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %define _without_dietlibc 1
 %define _without_xalan 1

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index 3b188eb..38f2669 100644 (file)
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -17,7 +17,7 @@
 
 %define name @PACKAGE@
 %define version @VERSION@
-%define release 13%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 15%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %define _without_dietlibc 1
 %define _without_xalan 1