From a83dcc9132ad8e19dfa3e363407f54b9be07aba4 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Thu, 24 Aug 2006 20:14:47 +0000 Subject: [PATCH] - merge changes from HEAD (primarily vserver.py bugfix) --- python/vserver.py | 4 +++- scripts/vuserdel | 7 +------ util-vserver.spec | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/python/vserver.py b/python/vserver.py index 81e5203..c6d07b6 100644 --- 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/vuserdel b/scripts/vuserdel index a875dc8..c7bd415 100755 --- a/scripts/vuserdel +++ b/scripts/vuserdel @@ -4,7 +4,7 @@ # # Copyright (c) 2004 The Trustees of Princeton University (Trustees). # -# $Id: vuserdel,v 1.8 2005/07/28 21:30:07 smuir Exp $ +# $Id: vuserdel,v 1.10 2006/07/01 20:42:39 mlhuang Exp $ # : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} @@ -41,11 +41,6 @@ do umount -l "$dir" done -# turn resource management off for vserver $NAME -chkconfig resman && service resman stop $NAME -# XXX - resman doesn't print a trailing newline -echo - # delete user [ -z "$STATIC" ] && userdel -r $NAME diff --git a/util-vserver.spec b/util-vserver.spec index 3dedc0c..c482a0f 100644 --- 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 14%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define _without_dietlibc 1 %define _without_xalan 1 -- 2.43.0