diff -Nurp util-vserver-0.30.210.orig/contrib/manifest.dat.pathsubst util-vserver-0.30.210.delete/contrib/manifest.dat.pathsubst --- util-vserver-0.30.210.orig/contrib/manifest.dat.pathsubst 2006-01-21 22:34:46.000000000 +0100 +++ util-vserver-0.30.210.delete/contrib/manifest.dat.pathsubst 2006-03-25 00:33:26.000000000 +0100 @@ -18,6 +18,7 @@ base @PKGLIBDIR@/vserver.start @ENSC_HAVE_C99_COMPILER_TRUE@base @PKGLIBDIR@/vserver.start.bin base @PKGLIBDIR@/vserver.stop base @PKGLIBDIR@/vserver.suexec +base @PKGLIBDIR@/vserver.delete core @PKGLIBDIR@/util-vserver-vars build @PKGLIBDIR@/rpm-fake.so legacy @LEGACYDIR@/save_s_context diff -Nurp util-vserver-0.30.210.orig/Makefile.in util-vserver-0.30.210.delete/Makefile.in --- util-vserver-0.30.210.orig/Makefile.in 2006-01-22 20:33:21.000000000 +0100 +++ util-vserver-0.30.210.delete/Makefile.in 2006-04-10 23:29:34.000000000 +0200 @@ -1927,7 +1927,8 @@ scripts_pkglib_src_DTA = scripts/functio scripts/vserver.functions \ scripts/vserver.start \ scripts/vserver.stop \ - scripts/vserver.suexec + scripts/vserver.suexec \ + scripts/vserver.delete scripts_pkglib_gen_DTA = scripts/util-vserver-vars scripts_pkglib_src_SCRPTS = scripts/pkgmgmt \ diff -Nurp util-vserver-0.30.210.orig/scripts/Makefile-files util-vserver-0.30.210.delete/scripts/Makefile-files --- util-vserver-0.30.210.orig/scripts/Makefile-files 2005-04-28 19:45:34.000000000 +0200 +++ util-vserver-0.30.210.delete/scripts/Makefile-files 2006-03-25 00:31:07.000000000 +0100 @@ -52,7 +52,8 @@ scripts_pkglib_src_DTA = scripts/functio scripts/vserver.functions \ scripts/vserver.start \ scripts/vserver.stop \ - scripts/vserver.suexec + scripts/vserver.suexec \ + scripts/vserver.delete scripts_pkglib_gen_DTA = scripts/util-vserver-vars diff -Nurp util-vserver-0.30.210.orig/scripts/vserver util-vserver-0.30.210.delete/scripts/vserver --- util-vserver-0.30.210.orig/scripts/vserver 2005-10-28 20:29:00.000000000 +0200 +++ util-vserver-0.30.210.delete/scripts/vserver 2006-03-23 23:07:03.000000000 +0100 @@ -57,6 +57,7 @@ Possible commands are: build * ... builds a new vserver from scratch + delete ... remove a vserver unify [-R] ... (de)unify vserver @@ -199,7 +200,7 @@ test "$2" != start -o -n "$OPTION_NONAME . $__PKGLIBDIR/vserver.functions case "$2" in - (start|stop) + (start|stop|delete) shift 2 . $__PKGLIBDIR/vserver.$cmd ;; diff -Nurp util-vserver-0.30.210.orig/scripts/vserver.delete util-vserver-0.30.210.delete/scripts/vserver.delete --- util-vserver-0.30.210.orig/scripts/vserver.delete 1970-01-01 01:00:00.000000000 +0100 +++ util-vserver-0.30.210.delete/scripts/vserver.delete 2006-03-25 00:49:35.000000000 +0100 @@ -0,0 +1,34 @@ +#! /bin/bash +# $Id$ + +# Copyright (C) 2006 Enrico Scholz +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +. "$_LIB_VSERVER_BUILD_FUNCTIONS" +. "$_LIB_VSERVER_BUILD_FUNCTIONS_PKGMGMT" + +if test -z "$OPTION_SILENT" ; then + read -p "Are you sure you want to delete the vserver $vserver (y/N) " deleteok + if [[ ${deleteok} != [Yy] ]]; then + exit 2 + fi +fi + +isVserverRunning "$VSERVER_DIR" && + "${SELF[@]}" $OPTION_SILENT --sync "$vserver" stop + +base.init +pkgmgmt.initVariables +rm -rf "`readlink -f "$VSERVER_DIR"/vdir`" "$VSERVER_DIR" "$PKGCFGDIR"