Get rid of the context on vuserdel.

Set svn:keywords.

diff --git a/configure.ac b/configure.ac
index 2284cfe..2274448 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 2604 2007-09-02 20:03:17Z dhozac $
+dnl $Id$

 
 dnl Copyright (C) 2002,2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 dnl  
 
 dnl Copyright (C) 2002,2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 dnl  

diff --git a/scripts/vcached b/scripts/vcached
index 0e09c7e..0acd511 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
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (c) 2004-2005 The Trustees of Princeton University
 #

-# $Id: vcached,v 1.14 2007/07/05 19:05:14 dhozac Exp $
+# $Id$

 #
 
 PATH=/sbin:/usr/sbin:$PATH
 #
 
 PATH=/sbin:/usr/sbin:$PATH

diff --git a/scripts/vcached.cron b/scripts/vcached.cron
index 3a88e9d..6a207d5 100644 (file)
--- a/scripts/vcached.cron
+++ b/scripts/vcached.cron
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (c) 2004-2005 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (c) 2004-2005 The Trustees of Princeton University
 #

-# $Id: vcached.cron,v 1.2 2005/09/01 18:52:53 mlhuang Exp $
+# $Id$

 #
 
 */15 * * * * root /usr/sbin/vcached
 #
 
 */15 * * * * root /usr/sbin/vcached

diff --git a/scripts/vuseradd b/scripts/vuseradd
index aa1210b..2c9dfb3 100755 (executable)
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #

-# $Id: vuseradd,v 1.28 2007/07/05 19:05:14 dhozac Exp $
+# $Id$

 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}

diff --git a/scripts/vuserdel b/scripts/vuserdel
index 778a0fa..c0a4cee 100755 (executable)
--- a/scripts/vuserdel
+++ b/scripts/vuserdel
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #
 #
 # Copyright (c) 2004  The Trustees of Princeton University (Trustees).
 #

-# $Id: vuserdel,v 1.11 2007/06/29 14:13:01 dhozac Exp $
+# $Id$

 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
 #
 
 : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}


@@ -28,7 +28,11 @@ NAME=$1
 CTX=`cat $__CONFDIR/$NAME/context`
 
 # don't bother stopping gracefully, just kill all the processes
 CTX=`cat $__CONFDIR/$NAME/context`
 
 # don't bother stopping gracefully, just kill all the processes

-chcontext --silent --secure --ctx $CTX $__LEGACYDIR/vserverkillall
+$_VKILL -c "$CTX" -s 15 -1
+sleep 2
+$_VKILL -c "$CTX" -s 9 -1
+$_VATTRIBUTE --set --xid "$CTX" --flag ~persistent
+$_NATTRIBUTE --set --nid "$CTX" --flag ~persistent

 
 # unmount any directories in vserver that are mount points
 for d in `sed -ne "s%^[^ ]* \($__DEFAULT_VSERVERDIR/$NAME/[^ ]*\) .*%\1%p" /proc/mounts`
 
 # unmount any directories in vserver that are mount points
 for d in `sed -ne "s%^[^ ]* \($__DEFAULT_VSERVERDIR/$NAME/[^ ]*\) .*%\1%p" /proc/mounts`