--- util-vserver-0.30.212.orig/lib/vserver-syscall-def.h +++ util-vserver-0.30.212/lib/vserver-syscall-def.h @@ -0,0 +1,48 @@ + +#include + +#include "syscall.h" + +#if defined(__alpha__) +#define __NR_vserver 428 +#elif defined(__arm__) +#define __NR_vserver 313 +#elif defined(__cris__) +#define __NR_vserver 273 +#elif defined(__frv__) +#define __NR_vserver 273 +#elif defined(__h8300__) +#define __NR_vserver 273 +#elif defined(__i386__) +#define __NR_vserver 273 +#elif defined(__ia64__) +#define __NR_vserver 1269 +#elif defined(__m32r__) +#define __NR_vserver * +#elif defined(__mc68000__) +#define __NR_vserver 278 +#elif defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI32) +#define __NR_vserver 277 +#elif defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_ABI64) +#define __NR_vserver 240 +#elif defined(__mips__) && (_MIPS_SIM == _MIPS_SIM_NABI32) +#define __NR_vserver 236 +#elif defined(__hppa__) +#define __NR_vserver 273 +#elif defined(__powerpc__) +#define __NR_vserver 257 +#elif defined(__s390__) +#define __NR_vserver 263 +#elif defined(__sh__) +#define __NR_vserver 273 +#elif defined(__sparc__) +#define __NR_vserver 267 +#elif defined(__v850__) +#define __NR_vserver * +#elif defined(__x86_64__) +#define __NR_vserver 236 +#endif + +static inline +_syscall3(int, vserver, uint32_t, cmd, uint32_t, id, void *, data); + --- util-vserver-0.30.212.orig/debian/util-vserver.templates +++ util-vserver-0.30.212/debian/util-vserver.templates @@ -0,0 +1,17 @@ +Template: util-vserver/postrm_remove_vserver_configs +Type: boolean +Default: false +_Description: Remove local Linux-Vserver guest configurations? + Choose this option if you want the /etc/vservers directory, containing + your local Linux-Vserver guest configurations, to be removed. If you wish to keep + these configurations, do not choose this option. + +Template: util-vserver/prerm_stop_running_vservers +Type: boolean +Default: true +_Description: Stop running Linux-Vserver guests? + Running Vserver guests were detected! If you remove util-vserver without + stopping these vservers they will continue to run and you will not be able + to manage them from the host, unless you reinstall util-vserver. Choose + this option to stop any running Vserver guests now, otherwise they will + continue to run. --- util-vserver-0.30.212.orig/debian/rules +++ util-vserver-0.30.212/debian/rules @@ -0,0 +1,200 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export CC=gcc-3.4 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +include /usr/share/dpatch/dpatch.make + +# (Most of) the files this concerns belong to /usr/lib/util-vserver. +# To keep referencing simple, and because we're not even sure there +# are files belonging to /var/lib/util-vserver, we stay with the default +# so far. +#MAKE_OPTS = pkglibdir=/var/lib/util-vserver PKGLIBDIR=/var/lib/util-vserver + +CFLAGS = -Wall -g + +# Some checks to avoid building on some arches as there is no reserved syscalls +# for the Linux kernel on this arch. +ifeq ($(DEB_HOST_ARCH),arm) + do_not_buid_this_arch +endif + +#ifeq ($(DEB_HOST_ARCH),powerpc) +# # dietlibc's sys/types.h tests for "powerpc", not "__powerpc__" +# CFLAGS += -Dpowerpc +#endif + +# Commented out as it do no longer build with this... +ifeq ($(DEB_HOST_ARCH),sparc) + # Targetting at older sparc's causes compilation errors. Steve Langasek + # says this works and it is anyway the oldest sparc generation we + # support in Debian (or kernel/glibc). + CFLAGS += -mcpu=v8 +endif + +ifeq ($(DEB_HOST_ARCH),hppa) + # dietlibc fails to define O_NOFOLLOW and O_LARGEFILE. These values + # have been copied from glibc's bits/fcntl.h. + # CFLAGS += -DO_NOFOLLOW=00000200 -DO_LARGEFILE=00004000 + # do_not_buid_this_arch +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# Fix to make it build on hppa, mipsel and s390 +# If this is not fixed, gcc is invoked as a cross compiler. +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +config.status: configure + dh_testdir +# $(MAKE) -f Makefile.svn +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + if [ -f config.sub ];then mv config.sub config.sub.orig;fi + ln -s /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + if [ -f config.guess ];then mv config.guess config.guess.orig;fi + ln -s /usr/share/misc/config.guess config.guess +endif + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure $(confflags) \ + --prefix=/usr --enable-release \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc --enable-dietlibc \ + --localstatedir=/var \ + --enable-apis=NOLEGACY \ + --with-vrootdir=/var/lib/vservers + +build: patch build-stamp + +build-stamp: config.status + dh_testdir + # Add here commands to compile the package. + $(MAKE) $(MAKE_OPTS) all + $(MAKE) -C man + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + -$(MAKE) distclean + rm -f config.status config.log config.sub config.guess + if [ -f config.sub.orig ];then \ + rm -f config.sub; \ + mv config.sub.orig config.sub; \ + fi + if [ -f config.guess.orig ];then \ + rm -f config.guess; \ + mv config.guess.orig config.guess; \ + fi + # clean up leftover files... + rm -rf tests/.libs vserver-start/.libs + debconf-updatepo + dh_clean + +install: patch build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/util-vserver. + $(MAKE) $(MAKE_OPTS) DESTDIR=$(CURDIR)/debian/util-vserver install install-distribution + # Fixes + chmod +x $(CURDIR)/debian/util-vserver/usr/lib/util-vserver/distributions/template/initpre + chmod +x $(CURDIR)/debian/util-vserver/usr/lib/util-vserver/distributions/template/initpost + rm -f $(CURDIR)/debian/util-vserver/usr/lib/*.la + + rm -f $(CURDIR)/debian/util-vserver/etc/init.d/vservers-legacy + rm -f $(CURDIR)/debian/util-vserver/etc/init.d/vservers-default + rm -f $(CURDIR)/debian/util-vserver/etc/init.d/rebootmgr + rm -f $(CURDIR)/debian/util-vserver/etc/init.d/vprocunhide + + # have to remove v_ init scripts + rm -f $(CURDIR)/debian/util-vserver/etc/init.d/v_* + # remove newvserver.defaults (because that is linuxconf and that is not supported in debian). + #rm -f $(CURDIR)/debian/util-vserver/etc/vservers/newvserver.defaults +# # Move util-vserver-vars to /etc/vservers as it is needed for legacy support +# grep -v "Id: util-vserver-vars.pathsubst,v" \ +# $(CURDIR)/debian/util-vserver/usr/lib/util-vserver/util-vserver-vars \ +# > $(CURDIR)/debian/util-vserver/etc/vservers/util-vserver-vars +# rm -f $(CURDIR)/debian/util-vserver/usr/lib/util-vserver/util-vserver-vars +# ln -s /etc/vservers/util-vserver-vars $(CURDIR)/debian/util-vserver/usr/lib/util-vserver/util-vserver-vars + # Fix for symlinks in /etc/vservers/.defaults + rm -f $(CURDIR)/debian/util-vserver/etc/vservers/.defaults/vdirbase + rm -f $(CURDIR)/debian/util-vserver/etc/vservers/.defaults/run.rev + # Rewrite util-vserver-vars + perl -pi -e \ + 's|^(.*DEFAULT_VSERVERDIR=).*$$|$$1"/etc/vservers/.defaults/vdirbase"|;' \ + debian/util-vserver/usr/lib/util-vserver/util-vserver-vars + + # Remove development files as they are not supported upstream in a + # proper way. +# rm -rf $(CURDIR)/debian/util-vserver/usr/include/ +# rm -f $(CURDIR)/debian/util-vserver/usr/lib/*.so* +# rm -f $(CURDIR)/debian/util-vserver/usr/lib/*.a +# rm -rf $(CURDIR)/debian/util-vserver/usr/lib/pkgconfig + + mkdir -p $(CURDIR)/debian/util-vserver/etc/bash_completion.d + cp $(CURDIR)/debian/vserver.bash_completion $(CURDIR)/debian/util-vserver/etc/bash_completion.d/vserver + + # Lintian overrides + mkdir -p $(CURDIR)/debian/util-vserver/usr/share/lintian/overrides + install -m644 debian/util-vserver.override $(CURDIR)/debian/util-vserver/usr/share/lintian/overrides/util-vserver + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installdebconf + dh_installinit + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps -L util-vserver -l debian/util-vserver/usr/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- util-vserver-0.30.212.orig/debian/control +++ util-vserver-0.30.212/debian/control @@ -0,0 +1,34 @@ +Source: util-vserver +Section: net +Priority: optional +Maintainer: Ola Lundqvist +Uploaders: Micah Anderson +# Reasons for the Build-Depends: +# * Legacy scripts require: +# net-tools because of nameif +# vlan because of vconfig +# dietlibc the libc NSS should not be used +# beecrypt2-dev to build vhashify +Build-Depends: debhelper (>= 4.1.16e), e2fslibs-dev, gawk, autotools-dev, dietlibc-dev (>= 0.29-2), net-tools, vlan, iptables, wget, procps, modutils|module-init-tools, autoconf (>= 2.52), libbeecrypt6-dev (>= 4.1.2-2), po-debconf, dpatch, libtool, automake1.9 +Standards-Version: 3.7.2 + +Package: util-vserver +Architecture: any +Depends: ${shlibs:Depends}, iproute, net-tools, make, debconf +Suggests: linux-image-2.6 (>= 2.6.16-17), kernel-patch-vserver, vlan, iptables, wget, procps, modutils|module-init-tools, yum +Recommends: binutils, debootstrap +Conflicts: vserver, vpopmail-bin +Replaces: vserver +Description: user-space tools for Linux-VServer virtual private servers + The util-vserver project provides the user-space tools for creating and + managing the virtualization technology known as Linux-Vserver guests. + Linux-Vserver guests are a significantly advanced jail mechanism running + inside a host GNU-Linux server. Linux-Vserver guests can be used to + securely partition resources such as processes, memory, network; logically + separate services or run entirely different distributions all on a single + system. Virtual private servers are separated from each other through security + contexts, and as a result are completely unaware of each other, or of the + host itself. + . + http://linux-vserver.org/ + http://ftp.linux-vserver.org/pub/utils/util-vserver/ --- util-vserver-0.30.212.orig/debian/docs +++ util-vserver-0.30.212/debian/docs @@ -0,0 +1,2 @@ +NEWS +README --- util-vserver-0.30.212.orig/debian/patches/03_vserver-build.functions_etc.dpatch +++ util-vserver-0.30.212/debian/patches/03_vserver-build.functions_etc.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_vserver-build_etc.dpatch by Micah Anderson > +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/scripts/vserver-build.functions trunk/scripts/vserver-build.functions +--- trunk~/scripts/vserver-build.functions 2006-03-20 10:11:54.000000000 -0500 ++++ trunk/scripts/vserver-build.functions 2006-03-20 10:12:25.000000000 -0500 +@@ -184,7 +184,7 @@ + { + test -z "$1" || _renameVserverCfg + { isDirectoryEmpty "$VDIR" && test ! -e "$SETUP_CONFDIR"; } || colpanic $"\ +-vserver-topdirectory '$VDIR' and/or configuration at '$SETUP_CONFDIR' ++vserver-topdirectory '$VDIR/etc' and/or configuration at '$SETUP_CONFDIR' + exist already; please try to use '--force', or remove them manually." + + mkdir -p -m755 "$VDIR" --- util-vserver-0.30.212.orig/debian/patches/00list +++ util-vserver-0.30.212/debian/patches/00list @@ -0,0 +1 @@ +03_vserver-build.functions_etc.dpatch --- util-vserver-0.30.212.orig/debian/dirs +++ util-vserver-0.30.212/debian/dirs @@ -0,0 +1,7 @@ +etc/vservers +usr/lib/util-vserver +usr/sbin +var/lib/vservers +var/run/vservers +var/run/vservers.rev +var/lock/subsys --- util-vserver-0.30.212.orig/debian/util-vserver.prerm +++ util-vserver-0.30.212/debian/util-vserver.prerm @@ -0,0 +1,75 @@ +#!/bin/sh + +set -e + +. /usr/share/debconf/confmodule + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +# Try to stop any vservers that are running in a sane way, no vservers should be +# running when configurations are removed! If it does not succeed, prompt the +# admin to do it. + +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} + +test -e "$UTIL_VSERVER_VARS" || + { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' is expected); aborting..." >&2 + exit 1 + } + +. "$UTIL_VSERVER_VARS" + +stop_vservers() { + set +e + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d util-vserver forcestop + else + /etc/init.d/util-vserver forcestop + fi + errno=$? + set -e + + if [ "$?" != 0 ]; then + echo "Trying to stop vservers resulted in exitcode $?." 1>&2 + echo "Stop them yourself and try again!" 1>&2 + exit 1 + fi +} + + +case "$1" in + remove|purge) + if [ -n "`vserver-stat | grep -v "CTX PROC VSZ RSS userTIME sysTIME UPTIME NAME" |grep -v ^0 2>/dev/null`" ] + then + db_reset util-vserver/prerm_stop_running_vservers || true + db_input high util-vserver/prerm_stop_running_vservers || true + db_go + db_get util-vserver/prerm_stop_running_vservers || true + if [ "$RET" = "true" ]; then + stop_vservers + else + echo "WARNING: running vservers detected, reinstall util-vserver to manage them" + fi + db_stop + fi + ;; + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 + --- util-vserver-0.30.212.orig/debian/copyright +++ util-vserver-0.30.212/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by +Noèl Köthe on Sat, 31 Jan 2004 21:59:58 +0100. + +It was downloaded from + http://www.13thfloor.at/vserver/d_rel26/v1.9.4/ + http://www.linux-vserver.org/ + +Upstream Author: + Enrico Scholz + +Copyright: + + 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; either version 2, or (at your option) any later version. + + 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 with + your Debian GNU system, in /usr/share/common-licenses/GPL, or with the + Debian GNU source package as the file GNUGPL.TXT. If not, write to the + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + --- util-vserver-0.30.212.orig/debian/changelog +++ util-vserver-0.30.212/debian/changelog @@ -0,0 +1,654 @@ +util-vserver (0.30.212-1x) feisty; urgency=low + + * recompiled with gcc-3.4 + + -- Tom Weber Sat, 2 Jun 2007 22:22:02 +0200 + +util-vserver (0.30.212-1) unstable; urgency=low + + * New upstream release + * Removed patches that are included in this release + * Removed build on Makefile.svn + + -- Micah Anderson Sat, 9 Dec 2006 11:57:43 -0700 + +util-vserver (0.30.211-6) unstable; urgency=low + + * Add cwd to the list of paths to exclude from namespace cleanup + (Closes: #401190) + + -- Micah Anderson Mon, 4 Dec 2006 09:14:56 -0700 + +util-vserver (0.30.211-5) unstable; urgency=high + + * Update vserver bash completion script to handle multiple sourcing + scenarios (Closes: #400044) + * Added mkdir -p lines to initscript for those who mount /var/run + as tmpfs (Ubuntu bug: #50545) + * Create 09_automake_versions.dpatch to patch build system to + use 1.9 automake utilities to fix FTBS (Closes: #400862) + * Update 08_rsyncbuild_namespace_clone_naddress.dpatch to fix + a small error that caused non-sysv initstyles to break + + -- Micah Anderson Tue, 28 Nov 2006 10:59:22 -0700 + +util-vserver (0.30.211-4) unstable; urgency=high + + * Added build-dep on libtool and automake1.9 + * Added 08_rsyncbuild_namespace_clone_naddress.dpatch to add support for + naddress (add/remove addresses on the fly), build -m rsync support, and + more namespace cleanup fixes + * Added 07_rsync_flags.dpatch to use the same flags for legacy as the rsync + build method's default (Closes: #383794) + * Added patch to improve namespace cleanup to make sure some required directories stick + around, and add some configuration options to exclude further paths. + * Added 05_fix_no_dev_sanity.dpatch to fix no_dev_sanity logic + * Added 04_optional_vlogin.dpatch to make vlogin optional + * Added 01_clone_updates patch so CLONE_NEWUTS|CLONE_NEWIPC are supported + * Updated scripts/vserver.functions, src/vserver-stat.c and src/vps.c to + note the new location of the upstream FAQ (Closes: Bug#400101) + * Updated capitalization in the initscript + * Removed pointless early startup info in /etc/defaults/util-vserver + * Removed vprocunhide status test in initscript, it was fundamentally flawed + * Fixed kernel detection in init script status (Closes: #398015) + * Added backgrounding for modern vserver guests in init script to support + defaults file (Closes: #391088) + * Added ALWAYS_STOP to /etc/defaults/util-vserver, with default set to + true so that when the system is rebooted, running vservers are stopped + to avoid potential filesystem corruption (Closes: #400132) + * Changed AUTO default in /etc/defaults/util-vserver to be true instead of + false + * Removed AUTO debconf question as this violated 10.7.4 (maintainer scripts + must not alter a conffile...including the one the script belongs to), + urgency set to high as this is a RC bug + * Special thanks goes to vagrant, he gets a delicious ball of queso fresco + as thanks + + -- Micah Anderson Wed, 22 Nov 2006 21:32:22 -0700 + +util-vserver (0.30.211-3) unstable; urgency=low + + * Updated Czech debconf translation from Miroslav Kure + , closes: #399611. + + -- Ola Lundqvist Tue, 21 Nov 2006 06:38:19 +0100 + +util-vserver (0.30.211-2) unstable; urgency=low + + * Updated French debconf templates, closes: #393095. + * Added German debconf translation, closes: #397114. Thanks to Helge + Kreutzmann for the patch. + + -- Ola Lundqvist Mon, 6 Nov 2006 07:15:07 +0100 + +util-vserver (0.30.211-1) unstable; urgency=low + + * Upgrade to new release + . removed 20 patches that have been included in upstream release + * Upgrade to examples/testfs.sh-0.14 + * Upgrade to examples/testme.sh-0.16 + * Make name more consistent (Closes: #389614) + * Updated project URL in debian/control and debian/watch + + -- Micah Anderson Sat, 7 Oct 2006 13:34:21 -0600 + +util-vserver (0.30.210-11) unstable; urgency=low + + Ola Lundqvist + * Enabled backwards compatibility, closes: #389720. + Thanks to Dariusz Pietrzak . + This include a change to the init script to make it work + for more than one legacy config file. + * Updated to standards version 3.7.2. + Micah Anderson Mon, 15 May 2006 11:07:37 -0500 + * Add Czech translation (Closes: #367173) + * Change short description to be accurate + * Fixed restart problem (Closes: #377690) + + -- Ola Lundqvist Sat, 30 Sep 2006 17:46:01 +0200 + +util-vserver (0.30.210-10) unstable; urgency=low + + * Correcting bash completion problem, closes: #365931, #366393. + Done by updating to version 0.4 and adding /usr/sbin to vserver-info call. + + -- Ola Lundqvist Mon, 8 May 2006 21:17:16 +0200 + +util-vserver (0.30.210-9) unstable; urgency=low + + * Add recommends on debootstrap and yum (Closes: #363382) + * Add french translation of debconf templates (Closes: #363422) + * Updated start vservers patch (Closes: #364179) + * Add vserver bash completion script (Closes: #364384) + + -- Micah Anderson Tue, 18 Apr 2006 17:03:18 -0400 + +util-vserver (0.30.210-8) unstable; urgency=low + + * Removed build-time tests from debian/rules (Closes: #362887) + * Update description to fix URL (Closes: #363342) + * Update description to be more up to date (Closes: #363343) + * Fix replacement of /etc/vservers/.defaults/vdirbase even if it + has been modified locally (Closes: #361382) + + -- Micah Anderson Sun, 16 Apr 2006 00:37:27 -0400 + +util-vserver (0.30.210-7) unstable; urgency=low + + * Fixed extra file installed in /etc/default (Closes: #361374) + * Updated vcontext --uid patch fixing segfaults when called with + incorrect usernames, and missing hunks for chkconfig in scripts/vserver + * Updated chroot barrier setting in initscript + * Added build-time tests to debian/rules + * Added apis patch to fix a typo and allowing for specifying oldproc and + olduts in --enable-apis in configure + * Added condrestart patch to fix conditional restarts in 'vserver' + * Added cpuset support patch + * Added patch to fix nice function + * Added prefix configure patch fix + * Added patch to warn that gentoo initstyle is not an option + * Added patch to fix start-vservers --all -stop not actually stopping all + vservers, just marked ones + * Added patch to fix vserver usage message to be more clear + * Added a patch that lets you install Fedora Core 5 guests + * Thanks go to Daniel Hokka Zakrisson! + + -- Micah Anderson Fri, 7 Apr 2006 16:57:06 -0400 + +util-vserver (0.30.210-6) unstable; urgency=low + + * Updated vserver delete patch + * Updated vlogin patch to 1.10 + + -- Micah Anderson Thu, 6 Apr 2006 13:33:10 -0400 + +util-vserver (0.30.210-5) unstable; urgency=low + + * Added patch for vnamespace cleanup, allows you + to touch /etc/vserver//namespace-cleanup or + touch /etc/vservers/.defaults/namespace-cleanup globally, + thanks to Bastian Blank (Closes: #360983) + * Add patch to cleanup s390 and sparc64 clone_arch, thanks + to Daniel Hokka Zakrisson (Closes: #361007) + * Updated vlogin patch, now handles echo better + + -- Micah Anderson Wed, 5 Apr 2006 16:27:43 -0400 + +util-vserver (0.30.210-4) unstable; urgency=low + + * Move barrier on non-directories to initscript to try and get + corner cases (Closes: #360885) + * Add missing db_stop to postinst + + -- Micah Anderson Tue, 4 Apr 2006 12:29:06 -0400 + +util-vserver (0.30.210-3) unstable; urgency=low + + * Removed bashisms from initscript (Closes: #360675) + * Fixed init script setting barrier on non-directories (Closes: #360765) + * Updated debconf templates to follow developers reference (Closes: #360755) + * Added vlogin patch from Daniel Hozac + + -- Micah Anderson Mon, 3 Apr 2006 11:19:16 -0400 + +util-vserver (0.30.210-2) unstable; urgency=low + + * Add dpatch to build-depends (Closes: #360563) + + -- Micah Anderson Sun, 2 Apr 2006 22:12:47 -0400 + +util-vserver (0.30.210-1) unstable; urgency=low + + * New upstream release (Closes: #343277, #307980) + * Replaced upstream init scripts with a single init script that + uses /etc/defaults and attempts to set the chroot barrier on start + * Added debconf templates to ask if vservers should be controlled by boot + * Added debconf templates on purge to ask about removing the entire + /etc/vservers directory + * Fixed things so we clean up after ourselves on uninstall (Closes: #348234) + * Fixed start-vservers improper temp file cleanup (Closes: #351556) + * Added patch to fix s390 clone syscall reversal (Closes: #356417) + * Change name of testme scripts to be consistant with upstream + * Add vschedcalc example script for calculating token buckets + * Add patch to fix suexec from host with an invalid ID running as root + (Closes: #360438) + * Add patch to fix vattribute bcaps not being reset + * Add patch to make chcontext behave as expected with --secure + * Add patch to add vserver delete option + * Moved make from a Recommends to a Depends (Closes: #327577) + * Updated syscall-alternatives.h to -shiny10 patch + + -- Micah Anderson Thu, 2 Feb 2006 09:45:30 -0500 + +util-vserver (0.30.209-2) unstable; urgency=low + + * Include delta-0.30.209-shiny8.diff fixing syscalls for mips + kudos to Greek0 and Bertl + * Enable hppa build in debian/rules as it is now supported + (Closes: #346223) + * Include fix from Kilian Krause to check for vserver support in the + kernel before running, stop the messy boot messages (Closes: #346156) + * Migrate to new package repository + * Add me as an Uploader in debian/control + * Bump Standards version to 3.6.2 (no changes) + * Added testme.sh and testfs.sh to examples/ (Closes: #346334) + + -- Micah Anderson Fri, 6 Jan 2006 18:03:32 -0500 + +util-vserver (0.30.209-1) unstable; urgency=low + + * New upstream release. + This fix a vserver escape problem on 2.4 kernel, closes: #329090. + * Documented that xattrs is needed as a mount option on reiserfs, + closes: #330529. + * Remove two files on purge, closes: #338383. + + -- Ola Lundqvist Fri, 2 Dec 2005 17:26:39 +0100 + +util-vserver (0.30.208-4) unstable; urgency=low + + * Applied patch that make it possible to build on any architecture + without the need of an vserver aware kernel, closes: #328209. Thanks + to Andrew Lee and Jrmy Bobbio + for the fix. + Closes: #323888 (as well). + * Corrected FSF address in debian/copyright. + + -- Ola Lundqvist Fri, 28 Oct 2005 21:44:57 +0200 + +util-vserver (0.30.208-3) unstable; urgency=low + + * Applied delta-0.30.208-fix02-fix03.diff patch to fix + vc_create_context issue, closes: #332193. Thanks to + Micah Anderson for the information. + * Depend on libbeecrypt6-dev (>= 4.1.2-2) to make sure that vhashify + will be built correctly, closes: #319927. + + -- Ola Lundqvist Sat, 8 Oct 2005 18:42:50 +0200 + +util-vserver (0.30.208-2) unstable; urgency=low + + * Applied patch-0.30.208-fix02.diff instead of patch-0.30.208- + fix01.diff. + + -- Ola Lundqvist Sun, 25 Sep 2005 22:26:45 +0200 + +util-vserver (0.30.208-1) unstable; urgency=low + + * New upstream release, closes: #321659. + * Applied fix patch from upstream. + http://www.13thfloor.at/vserver/s_rel26/v2.0/patch-0.30.208-fix01.diff.gz + * Added debian/watch file for simplified updates. + + -- Ola Lundqvist Thu, 18 Aug 2005 09:56:19 +0200 + +util-vserver (0.30.207-11) unstable; urgency=low + + * Sparc build fixed again with help of Steve Langasek + that suggested -mcpu=v8 instead of mv8. + + -- Ola Lundqvist Fri, 5 Aug 2005 08:46:28 +0200 + +util-vserver (0.30.207-10) unstable; urgency=low + + * Commented out -mv8 option to GCC as it no longer build with it, + closes: #321171. + + -- Ola Lundqvist Thu, 4 Aug 2005 10:22:51 +0200 + +util-vserver (0.30.207-9) unstable; urgency=low + + * Now almost all arches fail to build from source since the last fix, + closes: #314156. + + -- Ola Lundqvist Sun, 31 Jul 2005 11:01:17 +0200 + +util-vserver (0.30.207-8) unstable; urgency=low + + * Close issue with ia64 build (need latest dietlibc), + closes: #311855, #312075. + + -- Ola Lundqvist Sun, 12 Jun 2005 21:38:22 +0200 + +util-vserver (0.30.207-7) unstable; urgency=low + + * Fixed newly introduced bashism. + + -- Ola Lundqvist Tue, 24 May 2005 22:17:18 +0200 + +util-vserver (0.30.207-6) unstable; urgency=high + + * Use beecrypt6 instead of beecrypt2, closes: #309681. + * Suggest kernel-patch-vserver instead of kernel-patch-ctx, closes: #308998. + * Corrected documentation, closes: #308893. + * Better upgrade that avoid errors, closes: #305216. + + -- Ola Lundqvist Sun, 22 May 2005 19:20:47 +0200 + +util-vserver (0.30.207-5) unstable; urgency=high + + * libvserver so files is now in the package, closes: #306549. + + -- Ola Lundqvist Wed, 4 May 2005 13:19:30 +0200 + +util-vserver (0.30.207-4) unstable; urgency=high + + * Fix install issue again, closes: #307429. + + -- Ola Lundqvist Wed, 4 May 2005 13:06:16 +0200 + +util-vserver (0.30.207-3) unstable; urgency=high + + * Fix install issue, closes: #307429. + * Added dist-clean to clean target in debian/rules to make a less big + debian diff file. + + -- Ola Lundqvist Tue, 3 May 2005 18:41:30 +0200 + +util-vserver (0.30.207-2) unstable; urgency=medium + + * Added some more dependencies, closes: #305610. + + -- Ola Lundqvist Sun, 1 May 2005 23:09:44 +0200 + +util-vserver (0.30.207-1) unstable; urgency=medium + + * New upstream release. + * Added build dependency on beecrypt2-dev to build vhashify, + closes: #306549. + * Modified build with debootstrap, closes: #306531. + * Added -H to vserver-copy. + * Added a setattr --barrier to postinst. + * Default dir is now set in /etc/vservers/.default/vdirbase + even for legacy configuration. + + -- Ola Lundqvist Sun, 1 May 2005 22:01:08 +0200 + +util-vserver (0.30.206-3) unstable; urgency=low + + * Fixed minor documentation issue on the last fix. + * Moved back util-vserver-vars from /etc to /usr/lib/util-vserver. + * Manage symlinks in /etc/vservers/.defaults/ by using postinst + to make sure that they are not reset on upgrade. + * Changed postinst upgrade path so it fit latest util-vserver package. + + -- Ola Lundqvist Tue, 19 Apr 2005 17:09:52 +0200 + +util-vserver (0.30.206-2) unstable; urgency=low + + * Fix for scripts/vserver-build.functions so it check for VDIR/etc + instead of VDIR to allow for LVM mounted partitions. + + -- Ola Lundqvist Tue, 19 Apr 2005 16:48:31 +0200 + +util-vserver (0.30.206-1) unstable; urgency=low + + * New upstream release. + + -- Ola Lundqvist Sun, 17 Apr 2005 20:44:20 +0200 + +util-vserver (0.30.204-6) unstable; urgency=low + + * Added new manpages for vserver and vserver-build, closes: #304650. + + -- Ola Lundqvist Sun, 17 Apr 2005 19:41:08 +0200 + +util-vserver (0.30.204-5) unstable; urgency=medium + + * Fixed so that vserver-copy use bash instead of sh, closes: #304073. + * Fixed so that vserver-copy use --numeric-ids to allow proper copy + between servers, closes: #302321. + + -- Ola Lundqvist Sun, 10 Apr 2005 21:33:40 +0200 + +util-vserver (0.30.204-4) unstable; urgency=low + + * Build depend on a later version of dietlibc, closes: #301696. + * Added a rule to debian/rules so that it do not build on hppa + that do not have a reserved syscall in the kernel. + * Special build rule in debian/rules is no longer needed for powerpc + with the new dietlibc, and so removed. + + -- Ola Lundqvist Wed, 30 Mar 2005 07:40:13 +0200 + +util-vserver (0.30.204-3) unstable; urgency=low + + * Fix in configure call in order to make it build on s390, hppa and + mipsel, closes: #301696. Thanks to Steve Langasek + for pointing this out. + * This only work on autoconf (>= 2.52), so adding that build dep. + + -- Ola Lundqvist Mon, 28 Mar 2005 11:23:19 +0200 + +util-vserver (0.30.204-2) unstable; urgency=low + + * Removed provide of vserver-debiantools. + * Added build dependency on a fixed dietlibc. + This closes: #297806 with the fixes from Lars Wirzenius. + * Added a rule in debian/rules that cause a build error on arm arch. + + -- Ola Lundqvist Sat, 26 Mar 2005 09:30:53 +0100 + +util-vserver (0.30.204-1.1) unstable; urgency=low + + * debian/rules: Added stuff to put architecture specific macros to CFLAGS + to work around problems in dietlibc's header files. + * src/vshelper-sync.c: Test for __linux__ (which is defined always when + compiling for Linux) instead of __linux (which is not defined when + compiling with gcc --std=c99). + + -- Lars Wirzenius Thu, 24 Mar 2005 12:30:00 +0200 + +util-vserver (0.30.204-1) unstable; urgency=low + + * New upstream release. + This is the release that actually support alpha, see #297787. + * Make sure that util-vserver-vars is not updated every release just because + the Id string has been updated. + + -- Ola Lundqvist Sun, 13 Mar 2005 10:58:33 +0100 + +util-vserver (0.30.203-2) unstable; urgency=low + + * Moved util-vserver-vars to /etc/vservers in order to support + different vserver rootdir in legacy support mode. + * Removed conflict with vserver-debiantools. + * Documented how to support other location than /var/lib/vservers + for the vserver roots. + * Verified that compiling on a non-ctx kernel work with this + version of util-vserver, closes: #291426. + * New upstream version that will work on alpha, closes: #297787. + * It also have much better support for Debian and therefore the + vunify binary no longer need to be removed, closes: #176894. + * The vproc security is also in this version, closes: #258038. + * Uncommented the upgrade path from the vserver package and also + made sure that it works with this version of util-vserver. + + -- Ola Lundqvist Sat, 12 Mar 2005 11:43:58 +0100 + +util-vserver (0.30.203-1) experimental; urgency=low + + * New upstream version. + * No longer use dpatch (build dep removed). + * ndim_rollup.dpatch not applied. + * vserver-ctx-file-correction.diff no longer applies and is removed. + * Updated copyright file with upstream download location. + + -- Ola Lundqvist Sat, 26 Feb 2005 13:57:25 +0100 + +util-vserver (0.30.196-1) experimental; urgency=low + + * Hans Ulrich Niedermann + - Adapt for proposed upstream tarball with docs included. + - Require net-tools/nameif and vlan/vconfig (for legacy scripts). + - debian/patches/ndim_rollup.dpatch: Rollup patch to include docs. + This patch contains the difference between the released upstream + tarball and our proposed upstream tarball. Our proposal is to + include the docs built with non-free/contrib in the upstream + tarball, so that we don't need the tools to generate them. + * Kilian Krause + - preliminary alpha utils deb. + * Ola Lundqvist + Minor changes. + + -- Ola Lundqvist Fri, 7 Jan 2005 18:16:31 +0100 + +util-vserver (0.30-13) unstable; urgency=high + + * Use chmod instead of chattr becuase of dependencies. + + -- Ola Lundqvist Sat, 8 Jan 2005 23:12:29 +0100 + +util-vserver (0.30-12) unstable; urgency=high + + * SECURITY: Added a chattr +t /var/lib/vservers to postinst. + Also added documentation to a README.Debian file about this. + + -- Ola Lundqvist Fri, 7 Jan 2005 17:15:11 +0100 + +util-vserver (0.30-11) unstable; urgency=high + + * Important bugfix to make sure that two vservers do not get the same + context number, closes: #288694. + + -- Ola Lundqvist Wed, 5 Jan 2005 21:14:46 +0100 + +util-vserver (0.30-10) unstable; urgency=low + + * Applied a patch from Helmut Toplitzer + that fix a problem with the ctx numbers on vserver restarts. + Closes: #280723. + + -- Ola Lundqvist Sun, 12 Dec 2004 17:38:20 +0100 + +util-vserver (0.30-9) unstable; urgency=low + + * Applied patch to fix --vsroot option in vserver-copy script, + closes: #281848. Thanks to hk47@free.fr for the fix. + * Removed cvs and cvs2cl from build dependencies. + + -- Ola Lundqvist Sat, 27 Nov 2004 18:04:50 +0100 + +util-vserver (0.30-8) unstable; urgency=high + + * Fixed so that /var/run/vservers is a part of the package, + closes: #272616. + + -- Ola Lundqvist Mon, 27 Sep 2004 21:33:50 +0200 + +util-vserver (0.30-7) unstable; urgency=high + + * Fixed bug in security fix. It complains if the file or directory do + not exist. + * Fixed so that rebootmgr and vservers init scripts use /var/lock instead + of var/lock/subsys, closes: #270641. + + -- Ola Lundqvist Sat, 11 Sep 2004 19:44:11 +0200 + +util-vserver (0.30-6) unstable; urgency=high + + * Symlink security vulnerability fixed by introducing a testsafelinkdir + function to give the real path if it points inside the vserver. + * Also checks for proc symlink to avoid such symlink attacks. + * Fixed vserver-copy by using /bin/bash instead of /bin/sh. + * Fixed lintian error on chcontext manpage (now section 8 instead of 1). + + -- Ola Lundqvist Mon, 23 Aug 2004 11:23:53 +0200 + +util-vserver (0.30-5) unstable; urgency=low + + * Updated copyright so it refer to GPL in a proper way. + + -- Ola Lundqvist Tue, 17 Aug 2004 21:02:46 +0200 + +util-vserver (0.30-4) unstable; urgency=low + + * Fixed FTBFS error bu modifying Makefile, closes: #264685. + This TFBFS error only seem to exist on kernel 2.6 systems when running + pbuilder. + + -- Ola Lundqvist Mon, 16 Aug 2004 08:57:26 +0200 + +util-vserver (0.30-3) unstable; urgency=low + + * Started supporting vrpm (we should be able to install redhat even on + a Debian box). + * Removed /etc/vservers/newvserver.defaults because that is never used + by anything except linuxconf. + * Made upgrade path from vserver package, closes: #236680, #247429. + + -- Ola Lundqvist Thu, 12 Aug 2004 14:10:49 +0200 + +util-vserver (0.30-2) unstable; urgency=low + + * Fixed bashism in vservers init script, closes: #247431. + * Added suggest on newly created package vserver-debiantools. + * Clarified package description some. + * Fixed vserver error, closes: #259214. + Thanks to Daniel Hermann for + the patch. + * Changed from cp -ax to rsync -ax with exclude of VROOTDIR, + closes: #256655, #258487. + + -- Ola Lundqvist Wed, 28 Jul 2004 19:14:40 +0200 + +util-vserver (0.30-1) unstable; urgency=low + + * new upstream release + (closes: Bug#257853) + (closes: Bug#253307) + * team maintainance of util-vserver: + make Ola Lundqvist the maintainer and me co-maintainer + * util-vserver is replacing vserver which will be removed + * we have to conflict with vpopmail-bin because we have a + file with the same name in the package + (closes: Bug#254277) + * the problem with the /usr/share/doc/util-vserver/html + directory is now fixed + (closes: Bug#233823) + + -- Noèl Köthe Tue, 06 Jul 2004 19:33:00 +0200 + +util-vserver (0.29-5) unstable; urgency=medium + + * args.:( now the correct path: + /etc/util-vservers/ -> /etc/vservers/ + + -- Noèl Köthe Sat, 20 Mar 2004 20:23:49 +0100 + +util-vserver (0.29-4) unstable; urgency=medium + + * corrected /etc/util-vserver/ to /etc/util-vservers/ + to be compatible with the "vserver" package + (closes: Bug#238734) + + -- Noèl Köthe Fri, 19 Mar 2004 22:55:49 +0100 + +util-vserver (0.29-3) unstable; urgency=low + + * util-vserver-vars path move to /etc/util-vserver/ + * corrected path of util-vserver-vars in binaries + (closes: Bug#236704) + + -- Noèl Köthe Mon, 15 Mar 2004 23:05:40 +0100 + +util-vserver (0.29-2) unstable; urgency=low + + * fixed util-vserver-vars path in vserver + (closes: Bug#234332) + + -- Noèl Köthe Mon, 23 Feb 2004 20:41:40 +0100 + +util-vserver (0.29-1) unstable; urgency=low + + * new upstream release from 2004-02-11 + + -- Noèl Köthe Fri, 13 Feb 2004 22:39:10 +0100 + +util-vserver (0.28-1) unstable; urgency=low + + * Initial Release. + (closes: Bug#230565) + + -- Noèl Köthe Sat, 31 Jan 2004 21:59:58 +0100 + --- util-vserver-0.30.212.orig/debian/config +++ util-vserver-0.30.212/debian/config @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e +. /usr/share/debconf/confmodule + +db_title "util-vserver" || true + +db_input medium util-vserver/start_on_boot || true +db_go || true --- util-vserver-0.30.212.orig/debian/util-vserver.examples +++ util-vserver-0.30.212/debian/util-vserver.examples @@ -0,0 +1,4 @@ +debian/examples/README.TestScripts +debian/examples/testfs.sh-0.14 +debian/examples/testme.sh-0.16 +debian/examples/vschedcalc --- util-vserver-0.30.212.orig/debian/NEWS.Debian +++ util-vserver-0.30.212/debian/NEWS.Debian @@ -0,0 +1,11 @@ +util-vserver (0.30.211-4) unstable; urgency=high + + The behavior of /etc/default/util-vserver AUTO has changed slightly, please + read the comments in that file. + + All vservers will be stopped when /etc/init.d/util-vserver stop is run + due to the addition of the default ALWAYS_STOP=true. This is to avoid + unclean filesystems on shutdown, if you do not want this behavior please + adjust your /etc/default/util-vserver settings. + + -- micah anderson Wed, 22 Nov 2006 21:32:22 -0700 \ No newline at end of file --- util-vserver-0.30.212.orig/debian/util-vserver.postinst +++ util-vserver-0.30.212/debian/util-vserver.postinst @@ -0,0 +1,86 @@ +#!/bin/sh + +. /usr/share/debconf/confmodule + +set -e + +case "$1" in + configure) + # Remove older attr +t if present + if [ "`lsattr -d /var/lib/vservers/|cut -c16`" = "t" ] ; then + chattr -t /var/lib/vservers + fi + + # UPGRADE PATH FROM vserver PACKAGE! + # It should be fairly fail safe. + + # Source the old /etc/vserver.conf file to get the VROOTDIR + if [ -r /etc/vserver.conf ] ; then + . /etc/vserver.conf + if [ -n "$VSERVERS_ROOT" ] ; then + VROOTDIR="$VSERVERS_ROOT" + fi + if [ -n "$VSERVER_ROOT" ] ; then + VROOTDIR="$VSERVER_ROOT" + fi + rm /etc/vserver.conf + fi + + # SOURCE the old /etc/vservers.conf file to get the VROOTDIR + if [ -r /etc/vservers.conf ] ; then + . /etc/vservers.conf + if [ -n "$VSERVERS_ROOT" ] ; then + VROOTDIR="$VSERVERS_ROOT" + fi + if [ -n "$VSERVER_ROOT" ] ; then + VROOTDIR="$VSERVER_ROOT" + fi + rm /etc/vservers.conf + fi + + if [ -z $VROOTDIR ] + then + VROOTDIR=/var/lib/vservers + fi + + if [ ! -e /etc/vservers/.defaults/vdirbase ] ; then + ln -s $VROOTDIR /etc/vservers/.defaults/vdirbase + fi + + # Remove old startup scripts + rm -f /etc/init.d/vservers-legacy + rm -f /etc/init.d/vservers-default + rm -f /etc/init.d/vprocunhide + rm -f /etc/default/util-vservere + + if [ -f /etc/init.d/rebootmgr ] + then + /etc/init.d/rebootmgr stop + rm -f /etc/init.d/rebootmgr + fi + + # END OF UPGRADE PATH FROM vserver PACKAGE + + if [ ! -e /etc/vservers/.defaults/run.rev ] ; then + mkdir -p /var/run/vservers.rev + ln -s /var/run/vservers.rev /etc/vservers/.defaults/run.rev + fi + + db_stop + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + exit 0 + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; + +esac + +#DEBHELPER# + +exit 0 + --- util-vserver-0.30.212.orig/debian/vserver.bash_completion +++ util-vserver-0.30.212/debian/vserver.bash_completion @@ -0,0 +1,303 @@ +# Completion for the vserver command. Source this file (or on some systems +# add it to ~/.bash_completion and start a new shell) and bash's completion +# mechanism will know all about vserver's options! +# +# Copyright (C) Thomas Champagne +# +# 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; either version 2, or (at your option) +# any later version. +# +# 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. +# +# The latest version of this software can be obtained here: +# +# http://linux-vserver.org/Vserver+Completion +# +# version 0.4.0 + +have vserver-info && { +: ${UTIL_VSERVER_VARS:=$(/usr/sbin/vserver-info - SYSINFO |grep prefix: | awk '{ print $2}')/lib/util-vserver/util-vserver-vars} + +test -e "$UTIL_VSERVER_VARS" && { + +if [ -z "$_VS_NEWLINE" -o -z "$VS_ALLVSERVERS_ARGS" ] +then + . "$UTIL_VSERVER_VARS" + . "$_LIB_FUNCTIONS" +fi + +_vserver() { + local cur cmds cmdOpts cmdMethodOpts helpCmds names names_pipe func i j method + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + + # find available v-servers: + # call function getAllVservers in vserver library + getAllVservers names + names_pipe=`echo ${names[@]} | sed 's/ /|/g'` + + # available commands + cmds='start stop restart condrestart suexec exec enter chkconfig \ + running status unify pkg apt-get apt-config apt-cache \ + rpm pkgmgmt delete' + + # options (long and short name) + cmdOpts='--help --version --debug --defaulttty -s --sync -v \ + --verbose --silent --' + + cmdMethodOpts='-m -n --context --confdir --lockfile \ + --hostname --netdev --netbcast --netmask \ + --netprefix --interface --cpuset \ + --cpusetcpus --cpusetmems --cpusetvirt \ + --initstyle --flags --help --' + + # if the previous option is a single option + helpCmds='--help|--version' + if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] + then + return 0 + fi + + # search a verser's name + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) + do + if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] + then + # it's found + break + fi + done + + #a vserver has been found + if (( $i < ${#COMP_WORDS[@]}-1 )) + then + #Show the vserver command without build + case "${COMP_WORDS[i+1]}" in + start) + COMPREPLY=( $( compgen -W "--rescue --rescue-cmd" -- $cur ) ) + ;; + # No completion for apt-config + stop|restart|condrestart|enter|running|status|apt-config|delete) + ;; + suexec) + # I don't know how to do + COMPREPLY=( $( compgen -W -- $cur ) ) + ;; + exec) + #I don't know how to do + COMPREPLY=( $( compgen -W "" -- $cur ) ) + ;; + unify) + COMPREPLY=( $( compgen -W "-R" -- $cur ) ) + ;; + apt-get|apt-cache) + func=${COMP_WORDS[i+1]} + COMP_WORDS=( ${COMP_WORDS[@]:$((i+1))} ) + COMP_CWORD=$((COMP_CWORD-i-1)) + declare -f _${func//-/_} > /dev/null && _${func//-/_} + ;; + *) + COMPREPLY=( $( compgen -W "$cmds" -- $cur ) ) + ;; + esac + return 0 + else + #no vserver name found + prev=${COMP_WORDS[COMP_CWORD-1]} + + #search the new name of vserver + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do + if [[ ${COMP_WORDS[i]} == !(vserver|-*) ]]; then + # it's found + break + fi + done + + if (( $i < ${#COMP_WORDS[@]}-1 )) ; then + j=$i + i=${#COMP_WORDS[@]} + for (( ; j < ${#COMP_WORDS[@]}-1; j++ )); do + if [[ ${COMP_WORDS[j]} == "--" ]]; then + # method's parameter + case "$method" in + legacy|copy) + ;; + apt-rpm) + COMPREPLY=( $( compgen -W "-d" -- $cur ) ) + ;; + yum) + COMPREPLY=( $( compgen -W "-d" -- $cur ) ) + ;; + rpm) + COMPREPLY=( $( compgen -W "-d --empty --force --nodeps" -- $cur ) ) + ;; + skeleton) + ;; + debootstrap) + COMPREPLY=( $( compgen -W "-d -m -s --" -- $cur ) ) + ;; + *) + #do nothing + #the method is not defined + ;; + esac + return 0 + break + fi + if [[ ${COMP_WORDS[j]} == @(build|-m) ]]; then + i=$j + if (( $j+1 < ${#COMP_WORDS[@]}-1 )) ; then + method=${COMP_WORDS[j+1]} + fi + fi + done + + if (( $i < ${#COMP_WORDS[@]}-1 )) ; then + case $prev in + --help) + #do nothing + ;; + -n|--context|--confdir|--lockfile|--hostname|--netdev|--netbcast|--netmask|--netprefix|--interface|--cpuset|--cpusetcpus|--cpusetmems|--cpusetvirt|--initstyle|--flags) + COMPREPLY=( $( compgen -W "" -- $cur ) ) + ;; + -m) + COMPREPLY=( $( compgen -W "legacy copy apt-rpm yum rpm skeleton debootstrap" -- $cur ) ) + ;; + *) + COMPREPLY=( $( compgen -W "$cmdMethodOpts" -- $cur ) ) + ;; + esac + + else + COMPREPLY=( $( compgen -W "build" -- $cur ) ) + fi + else + COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) + fi + return 0 + fi + + return 0 +} +complete -F _vserver vserver + +_vapt_rpm_yum() +{ + local cur cmds cmdOpts helpCmds names func i + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + + # options (long and short name) + cmdOpts='--help --version --quiet -q --all' + + # if the previous option is a single option + helpCmds='--help|--version' + if [[ "${COMP_WORDS[1]}" == "@($helpCmds)" ]] ; then + return 0 + fi + + # search -- + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do + if [[ ${COMP_WORDS[i]} = "--" ]]; then + # it's found + break + fi + done + + # find available v-servers: + # call function getAllVservers in vserver library + getAllVservers names + names_pipe=`echo ${names[@]}" --all" | sed 's/ /|/g'` + + if (( $i < ${#COMP_WORDS[@]}-1 )) && (( $i < $COMP_CWORD )) ; then + func=${COMP_WORDS[0]:1} + COMP_WORDS=( $func ${COMP_WORDS[@]:$((i+1))} ) + COMP_CWORD=$((COMP_CWORD-i)) + declare -f _${func//-/_} > /dev/null && _${func//-/_} + else + # search a verser's name + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do + if [[ ${COMP_WORDS[i]} == @($names_pipe) ]]; then + # it's found + break + fi + done + + if (( $i < ${#COMP_WORDS[@]}-1 )) ; then + if [[ "${COMP_WORDS[i]}" = "--all" ]]; then + cmdOpts='--' + COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) ) + else + cmdOpts='--' + COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) + fi + else + COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) + fi + fi + return 0 +} +complete -F _vapt_rpm_yum vapt-get +complete -F _vapt_rpm_yum vrpm +complete -F _vapt_rpm_yum vyum + + +_vserver_copy() +{ + local cur prev cmdOpts helpCmds confCmds names names_pipe i + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + + # find available v-servers: + # call function getAllVservers in vserver library + getAllVservers names + names_pipe=`echo ${names[@]} | sed 's/ /|/g'` + + # options (long and short name) + cmdOpts='--help -h --version -V --verbose -v --quiet -q \ + --vsroot -r --rsh -R --stopstart -s \ + --domain -d --ip -i' + + # if the previous option is a single option + helpCmds='--help|-h|--version|-V' + if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then + return 0 + fi + + confCmds='--ip|-i|--domain|-d' + prev=${COMP_WORDS[COMP_CWORD-1]} + if [[ $prev == @($confCmds) ]]; then + return 0 + fi + + # search a verser's name + for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do + if [[ ${COMP_WORDS[i]} == @($names_pipe) ]]; then + # it's found + break + fi + done + + if (( $i < ${#COMP_WORDS[@]}-1 )) ; then + return 0 + else + COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) ) + fi + return 0 +} +complete -F _vserver_copy vserver-copy + +} +} --- util-vserver-0.30.212.orig/debian/compat +++ util-vserver-0.30.212/debian/compat @@ -0,0 +1 @@ +4 --- util-vserver-0.30.212.orig/debian/util-vserver.override +++ util-vserver-0.30.212/debian/util-vserver.override @@ -0,0 +1,5 @@ +# Cleanup for old versions +util-vserver binary: postrm-contains-additional-updaterc.d-calls /etc/init.d/vservers +# Call other function that support this. +util-vserver binary: init.d-script-does-not-implement-required-option +util-vserver binary: statically-linked-binary --- util-vserver-0.30.212.orig/debian/util-vserver.postrm +++ util-vserver-0.30.212/debian/util-vserver.postrm @@ -0,0 +1,45 @@ +#!/bin/sh +# on purge what should be removed? maybe do it like mysql databases + +. /usr/share/debconf/confmodule + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade) + update-rc.d -f vservers remove >/dev/null || exit 0 + ;; + purge|disappear) + rm -f /etc/vservers/.defaults/run.rev + rm -rf /var/run/vservers.rev + rm -f /etc/vservers/.defaults/vdirbase + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 +esac + +if [ "$1" = "purge" -a ! \( -x /usr/sbin/vserver \) ]; then + db_input high util-vserver/postrm_remove_vserver_configs || true + db_go + if [ "$RET" = "true" ]; then + rm -rf /etc/vservers + fi +fi + +#DEBHELPER# + +exit 0 + --- util-vserver-0.30.212.orig/debian/util-vserver.init +++ util-vserver-0.30.212/debian/util-vserver.init @@ -0,0 +1,243 @@ +#!/bin/sh + +DEBIANCONFIG=/etc/default/util-vserver + +if [ -f $DEBIANCONFIG ] +then + . $DEBIANCONFIG +fi + +# Ensure necessary directories exist +mkdir -p /var/run/vservers +mkdir -p /var/run/vservers.rev +mkdir -p /var/run/vshelper + +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} + +test -e "$UTIL_VSERVER_VARS" || + { + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' is expected); aborting..." >&2 + exit 1 + } + +. "$UTIL_VSERVER_VARS" + +PIDFILE=/var/run/rebootmgr.pid +LOCKFILE=$MARK +vprocunhide_lockfile=/var/run/vprocunhide +export MARK NUMPARALLEL LOCKFILE + +# Test to see if there are legacy configs around +TMPLEGACYTEST=$(find /etc/vservers/ -name "*.conf") +if [ -n "$TMPLEGACYTEST" ] +then + legacy=yes +fi + +# Print the vserver name in priority/alpha order +# This function is only used for legacy configs +sortserver(){ + ( + cd $__CONFDIR + for serv in *.conf + do + test -f "$serv" || continue + + PRIORITY=100 + . $serv + test "$ONBOOT" || continue + printf "%03d %s\n" $PRIORITY `basename $serv .conf` + done + ) | sort $* | (while read a b; do echo $b; done) +} + +# Start vservers +# This function is only used for legacy configs +startservers(){ + cd $__CONFDIR + for name in `sortserver` + do + ONBOOT= + . $name.conf + if [ "$ONBOOT" = "yes" ] ; then + echo "Starting Linux-VServer guests..." + $_VSERVER_LEGACY $name start + else + echo "virtual server $name not configured for on boot start" + fi + done +} + +start() +{ + + # First set vserver related attributes for /proc, this + # makes some necessary /proc entries visible in vservers + + if [ -e /proc/self/vinfo ] + then + + # Check for vc_set_iattr feature, if its not detected, then we are probably running a + # 2.4 kernel where all of /proc is unhidden by default + $_VSERVER_INFO - FEATURE iattr + if [ $? -eq 0 ] + then + echo -n $"Fixing visibility of /proc entries for Linux-VServer guests..." + $_VPROCUNHIDE + if [ $? -ne 0 ] + then + echo "Error in setting Linux-VServer related attributes for /proc" + else + touch "$vprocunhide_lockfile" + echo "done." + fi + fi + + # Remove barrier on / if it exists + if [ -e /proc/self/vinfo ] + then + showattr -d / | awk '{print $1'} | grep -q B + if [ $? -eq 0 ] + then + setattr --~barrier / + fi + fi + + # Then set the chroot barrier + for vserver in `ls /etc/vservers` + do + vdiractual=`readlink -f /etc/vservers/$vserver/vdir` + if [ -d "$vdiractual" ] + then + setattr --barrier $vdiractual/.. + fi + done + + vrootactual=`readlink -f /etc/vservers/.defaults/vdirbase` + setattr --barrier $vrootactual + + # Then start up vservers with $MARK if $AUTO is set to start things + if [ "$AUTO" = "true" ] + then + if [ "$BACKGROUND" = "on" ] + then + echo "Starting Linux-VServers in background" + /usr/lib/util-vserver/vserver-wrapper start >/dev/tty8 /dev/tty8 & + else + /usr/lib/util-vserver/vserver-wrapper start + fi + else + echo "Auto starting of Linux-VServer guests is not enabled in $DEBIANCONFIG" + echo "Please start your Linux-VServer guests manually with 'vserver start'" + fi + + else + echo -n $"Linux-VServer capability not detected in kernel." + fi + + echo +} + +stop() +{ + if [ -e /proc/self/vinfo ] + then + if [ "$AUTO" = "true" ] + then + /usr/lib/util-vserver/vserver-wrapper stop; + fi + if [ "$ALWAYS_STOP" = "true" ] + then + forcestop + fi + rm -f "$vprocunhide_lockfile" + else + echo -n $"Linux-VServer capability not detected in kernel." + fi + +} + +forcestop() +{ + echo "Stopping all running Linux-VServer guests..." + for vserver in `vserver-stat | grep -v "CTX PROC VSZ RSS userTIME sysTIME UPTIME NAME" |grep -v ^0 | awk '{print $8}'` + do + echo -n "Stopping $vserver: " + vserver $vserver stop >& /dev/null + echo "done." + done + # This is broken: /usr/lib/util-vserver/start-vservers --stop --running +} + +restart() +{ + stop + start +} + +case "$1" in + start) + # First run the legacy starts, if there are any + if [ "$legacy" = "yes" ]; then + if [ "$BACKGROUND" = "yes" ] ; then + startservers >/dev/tty8 /dev/tty8 & + else + startservers + fi + touch /var/lock/subsys/vservers-legacy + fi + # Then start the modern vservers, if there are any + start + ;; + stop) + # First stop the legacy vservers + if [ "$legacy" = "yes" ]; then + echo "Stopping Vservers" + cd $__CONFDIR + for name in `sortserver -r` + do + $_VSERVER_LEGACY $name stop + done + rm -f /var/lock/subsys/vservers-legacy + fi + # Then stop the modern vservers + stop + ;; + forcestop) + stop + forcestop + ;; + restart) + $1 + ;; + reload) + ;; + status) + # Do tests for old legacy interface + if [ "$legacy" = "yes" ]; then + cd $__CONFDIR + for serv in *.conf + do + ONBOOT=no + name=`basename $serv .conf` + . $serv + echo -n ONBOOT=$ONBOOT " " + $_VSERVER_LEGACY $name running + done + else + # Now check for the modern stuff + APIVER=`vserver-info - APIVER` + if [ $? -ne 0 ] + then + echo "Linux-VServer enabled kernel not detected" + else + echo "API version detected in kernel: $APIVER" + vserver-stat + fi + fi + ;; + *) + echo "Usage: $0 {start|stop|forcestop|reload|restart|status}" + exit 2 + ;; +esac --- util-vserver-0.30.212.orig/debian/examples/vschedcalc +++ util-vserver-0.30.212/debian/examples/vschedcalc @@ -0,0 +1,69 @@ +#!/bin/bash +# +# vschedcalc - Calculate token buckets +# Copyright (C) 2005 Benedikt Boehm +# +# 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; either version 2 +# of the License, or (at your option) any later version. +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +trap "exit 1" INT + +echo ">> Welcome to the token bucket calculator" +echo ">> You need to enter some configuration options" +echo " Default values are shown in brackets" +echo + +# get config values +echo -n "Kernel HZ value (1000): " +read hz + +[ -z "${hz}" ] && hz=1000 + +while true; do + echo -n "Fill rate: " + read fillrate + [ -n "${fillrate}" ] && break + echo "!! Please enter a valid fill rate" +done + +while true; do + echo -n "Avg. CPU usage in %: " + read avgcpu + [ -n "${avgcpu}" ] && break + echo "!! Please enter a valid CPU usage" +done + +while true; do + echo -n "Max. burst time in sec: " + read maxburst + [ -n "${maxburst}" ] && break + echo "!! Please enter a valid burst time" +done + +echo -n "Hold processes after burst in sec (0): " +read bursthold + +[ -z "${bursthold}" ] && bursthold=0 + +# calculate token bucket +let interval=100*${fillrate}/${avgcpu} +let tokensmin=${hz}*${bursthold}*${fillrate}/${interval} +let tokensmax=${hz}*${maxburst}-${maxburst}*${interval} + +echo +echo ">> Voila. Your token bucket looks like:" +echo "FillRate: ${fillrate}" +echo "Interval: ${interval}" +echo "TokensMin: ${tokensmin}" +echo "TokensMax: ${tokensmax}" --- util-vserver-0.30.212.orig/debian/examples/testfs.sh-0.14 +++ util-vserver-0.30.212/debian/examples/testfs.sh-0.14 @@ -0,0 +1,505 @@ +#!/bin/bash + +shopt -s extglob + +eR='\e[31m';eG='\e[32m';eY='\e[33m';eB='\e[34m';eN='\e[0m' + +function eecho () { + C=$1; shift + echo -e "$C$*$eN" +} + +function techo () { + C=$1; shift + echo -en "$C$*$eN" +} + +function ececho () { + rc=$1; shift + id=$1; shift + if [ $rc -eq 0 ]; then + [ $terse -ne 0 ] && techo $eG "$id. " || \ + eecho $eG "$id# succeeded." + else + [ $terse -ne 0 ] && techo $eR "$id* " || \ + eecho $eR "$id# failed." + fi + return $rc +} + +function eexec () { + local id=`printf "[%3.3s]" $1`; shift + local eret=$1; shift + + echo -e "\t$*" >$outdev + if [ $terse -gt 0 ]; then + eval $* 1>/dev/null 2>&1 3>&1 + else + eval $* 3>&2 1>$outdev 2>$errdev + fi + local ret=$? + [ -n "$eret" -a "$eret" -ne 0 ] \ + && ret=$(( ret - eret )) + ececho $ret $id + return $ret +} + + +function go_xid () { + local xid=$1; shift + + if [ "$version" == "24" -a $xid -gt 0 ]; then + echo -e "\tchcontext --ctx $xid $*" + chcontext --ctx $xid $* + elif [ $xid -gt 1 ]; then + echo -e "\tvcontext --create --xid $xid -- $*" + vcontext --create --xid $xid -- $* + elif [ $xid -eq 1 ]; then + echo -e "\tvcontext --migrate --xid 1 -- $*" + vcontext --migrate --xid 1 -- $* + else + echo -e "\t$*" + $* + fi +} + + +function do_xid_touch () { + local path="$1"; shift + local pos=1 + local ret=0 + + while [ $# -gt 0 ]; do + local file="$path/file_$pos" + echo -e "\ttouch $file: $1" + go_xid $1 "touch $file" + local rc=$? + [ $rc -eq 0 ] || { ret=1; + eecho $eR "\ttouch $file: $1 [$rc]" 1>&3; } + shift + pos=$[pos+1]; + done + return $ret +} + +function do_xid_verify () { + local path="$1"; shift + local pos=1 ret=0 + + while [ $# -gt 0 ]; do + local file="$path/file_$pos" + val=`lsxid -d $file | awk '{print $1}'` + echo -e "\tverify $file: $1 = $val" + [ "$val" -eq "$1" ] || { ret=1; + eecho $eR "\tverify $file: $1 = $val" 1>&3; } + shift + pos=$[pos+1]; + done + return $ret +} + +function do_xid_change () { + local path="$1"; shift + local pos=1 ret=0 + + while [ $# -gt 0 ]; do + local file="$path/file_$pos" + echo -e "\tchange $file: $1" + chxid -c $1 $file + local rc=$? + [ $rc -eq 0 ] || { ret=1; + eecho $eR "\tchange $file: $1 [$rc]" 1>&3; } + shift + pos=$[pos+1]; + done + return $ret +} + +function do_xid_read () { + local path="$1"; shift + local pos=1 ret=0 + + while [ $# -gt 1 ]; do + local file="$path/file_$pos" + local x=0 xx="" + + for x in 0 1 2 $1; do + go_xid $x cat "$file" >/dev/null + local rc=$? + [ $rc -eq 0 ] && xx="$xx." || xx="$xx^" + done + [ "$xx" == "$2" ] || { ret=1; + eecho $eR "\tread $file: $1 [$xx:$2]" 1>&3; } + + shift; shift + pos=$[pos+1]; + done + return $ret +} + +function do_xid_write () { + local path="$1"; shift + local pos=1 ret=0 + + while [ $# -gt 1 ]; do + local file="$path/file_$pos" + local x=0 xx="" + + for x in 0 1 2 $1; do + echo "test-$pos" | go_xid $x tee "$file" >/dev/null + local rc=$? + [ $rc -eq 0 ] && xx="$xx." || xx="$xx^" + done + [ "$xx" == "$2" ] || { ret=1; + eecho $eR "\twrite $file: [$xx:$2] $1" 1>&3; } + + shift; shift + pos=$[pos+1]; + done + return $ret +} + + +function do_xattr_barrier () { + local path="$1"; shift + local bdir="$1"; shift + local ret=0 + + local x=0 xx="" + for x in 0 1 2; do + go_xid $x chmod +x "$bdir" + local rc=$? + chmod -x "$bdir" + [ $rc -eq 0 ] && xx="$xx." || xx="$xx^" + done + [ "$xx" == "$1" ] || { ret=1; + eecho $eR "\tbarrier $bdir: [$xx:$1]" 1>&3; } + return $ret +} + +function do_xattr_iunlink () { + local path="$1"; shift + local file="$1"; shift + local ret=0 + + local x=0 xx="" + for x in 0 1 2; do + go_xid $x chmod +x "$file" + local rc=$? + chmod -x "$file" + [ $rc -eq 0 ] && xx="$xx." || xx="$xx^" + done + [ "$xx" == "$1" ] || { ret=1; + eecho $eR "\tiunlink chmod $file: [$xx:$1]" 1>&3; } + return $ret +} + +function do_xattr_verify () { + local path="$1"; shift + local vcmd="$1"; shift + local pos=1 ret=0 + + while [ $# -gt 0 ]; do + local file="$1"; shift + val=`$vcmd -d $file | awk '{print $1}'` + echo -e "\tverify $file: $1 = $val" + case $val in + $1) ;; + *) ret=1 + eecho $eR "\tverify $file: $1 ~ $val" 1>&3 + ;; + esac + shift + done + return $ret +} + +function do_sync () { + sync + sleep 6 +} + +function do_test () { + local fs=$1 + local mopt=$2 + local xopt="$mopt,$tagxid" + local X="-" + + do_sync + [ $test_xid -gt 0 ] && { + + [ $terse -ne 0 ] && echo "($fs format)" + eecho $eB "xid related tests ..." + + local xids="0 1 255 256 666" + local rpat="0 .... 1 ..^. 255 ..^." + local wpat="0 .... 1 ..^. 255 ..^." + + eexec 001 0 "mount -t $fs -o $mopt $DEV $MNT 3>&2" || return + eexec 002 32 "mount -o remount,$xopt $DEV 3>&2" + eval "umount $DEV 3>&2" + + eexec 011 0 "mount -t $fs -o $xopt $DEV $MNT 3>&2" || return + eexec 012 0 "do_xid_touch $MNT $xids" + eexec 014 0 "do_xid_verify $MNT $xids" + eexec 015 0 "do_xid_read $MNT $rpat" + eexec 019 0 "umount $DEV 3>&2" + + [ $terse -ne 0 ] && echo "" + + eval "mount -t $fs -o $xopt $DEV $MNT 3>&2" || return + eexec 020 0 "do_xid_verify $MNT $xids" + eexec 021 0 "mount -o remount,$xopt $DEV 3>&2" + eexec 022 0 "do_xid_verify $MNT $xids" + eexec 023 0 "mount -o remount,$mopt $DEV 3>&2" + eexec 024 0 "do_xid_verify $MNT $xids" + eexec 025 0 "do_xid_read $MNT $rpat" + eexec 026 0 "do_xid_verify $MNT $xids" + eexec 027 0 "do_xid_write $MNT $wpat" + eexec 028 0 "do_xid_verify $MNT $xids" + + [ $terse -ne 0 ] && echo "" + + local xids="200 201 256 254 777" + local rpat="200 ..^." + local wpat="200 ..^. 201 ..^." + + eexec 033 0 "do_xid_change $MNT $xids" + eexec 034 0 "do_xid_verify $MNT $xids" + eexec 035 0 "do_xid_read $MNT $rpat" + eexec 037 0 "do_xid_write $MNT $wpat" + eval "umount $DEV 3>&2" + + [ $terse -ne 0 ] && echo "" + X="X" + } + + [ $test_xattr -gt 0 ] && { + + eecho $eB "xattr related tests ..." + + case $version in + 24) + local attr_B="---BU--" attr_b="---bu--" + local attr_U="----U--" attr_u="----u--" + local lsattr_B="-+(-)-t*(-)" + local lsattr_U="-+(-)-i-+(-)-t*(-)" + ;; + *) + local attr_B="---Bui-" attr_b="---bui-" + local attr_U="----UI-" attr_u="----ui-" + local lsattr_B="-+(-)?(A)+(-)" + local lsattr_U="-+(-)-i-+(-)?([AE])+(-)" + ;; + esac + + local dpath="$MNT/dir_$$" + local fpath="$MNT/file_$$" + + eexec 101 0 "mount -t $fs -o $mopt $DEV $MNT 3>&2" || return + eval "mkdir -p $dpath" + eexec 102 0 "setattr --barrier $dpath" + eexec 103 0 "do_xattr_verify $MNT showattr $dpath $attr_B" + eexec 104 0 "do_xattr_verify $MNT lsattr $dpath $lsattr_B" + eexec 106 0 "do_xattr_barrier $MNT $dpath .^^" + eexec 108 0 "setattr --~barrier $dpath" + eexec 109 0 "do_xattr_verify $MNT showattr $dpath $attr_b" + eval "rmdir $dpath" + + [ $terse -ne 0 ] && echo "" + + eval "echo five > $fpath" + eval "ln $fpath $fpath.x" + eexec 112 0 "setattr --iunlink $fpath" + eexec 113 0 "do_xattr_verify $MNT showattr $fpath $attr_U" + eexec 114 0 "do_xattr_verify $MNT lsattr $fpath $lsattr_U" + eexec 115 0 "ln $fpath $fpath.y" + eexec 116 0 "do_xattr_iunlink $MNT $fpath ^^^" + eexec 117 0 "go_xid 2 rm -f $fpath" + eexec 118 0 "setattr --~iunlink $fpath.x" + eexec 119 0 "do_xattr_verify $MNT showattr $fpath.x $attr_u" + eval "rm -f $fpath.y $fpath.x" + + [ $terse -ne 0 ] && echo "" + + eval "mkdir -p $dpath" + eval "setattr --barrier $dpath" + eval "echo five > $fpath" + eval "setattr --iunlink $fpath" + eval "umount $DEV 3>&2" + eval "mount -t $fs -o $mopt $DEV $MNT 3>&2" || return + eexec 121 0 "do_xattr_verify $MNT showattr $dpath $attr_B" + eexec 122 0 "do_xattr_verify $MNT lsattr $dpath $lsattr_B" + eexec 123 0 "do_xattr_verify $MNT showattr $fpath $attr_U" + eexec 124 0 "do_xattr_verify $MNT lsattr $fpath $lsattr_U" + eexec 199 0 "umount $DEV 3>&2" + + [ $terse -ne 0 ] && echo "" + } + return 0 +} + +verbose=0 +terse=0 +test_xid=0 +test_xattr=1 +version="26" +tagxid="tagxid" + +DEV="" +MNT="/test" +NFS="127.0.0.1:/nfs" +FSL="ext2,ext3,xfs,reiser,jfs" + +mntopt="rw" +nfsopt="vers=3,hard,intr,tcp,sync" + + +while getopts ":hlnotvxD:F:M:N:O:" option; do + case $option in + h) # help + cat << EOF +Usage: $cmdname [OPTION]... + + -h help + -l legacy barrier code + -n no color codes + -t terse output + -o mount options [$mntopt] + -v be verbose + -x xid tagging tests + -D device to use [$DEV] + -F filesystems + -M mount point [$MNT] + -N nfs source [$NFS] + -O nfs options [$nfsopt] + +examples: + + $cmdname -F ext2 # check fs + $cmdname -v # verbose test + +EOF + exit 0 + ;; + v) # be verbose + verbose=$(( verbose + 1 )) + ;; + x) # test xid tagging + test_xid=1; + ;; + l) # old barrier code + version="24"; + # tagxid="tagctx"; + ;; + n) # no color + eR='';eG='';eY='';eB='';eN='' + nocolor=1; + ;; + o) # mount options + mntopt="$OPTARG" + ;; + t) # terse output + terse=1 + ;; + D) # device + DEV="$OPTARG" + ;; + F) # single fs + FSL="$OPTARG" + ;; + M) # mount point + MNT="$OPTARG" + ;; + N) # nfs options + NFS="$OPTARG" + ;; + O) # nfs mount options + nfsopt="$OPTARG" + ;; + esac +done +shift $(($OPTIND - 1)) + +if [ -z "$DEV" ]; then + eecho $eR "Please specify a device!" >&2 + exit 1 +elif [ ! -e "$DEV" ]; then + eecho $eR "Please specify a valid device!" >&2 + exit 1 +fi + +if [ ! -d "$MNT" ]; then + eecho $eR "Please specify an existing mountpoint or create \"$MNT\"!" >&2 + exit 1 +fi + +outdev="/dev/null" +[ $verbose -gt 1 ] && outdev="/dev/stdout" +errdev="/dev/null" +[ $verbose -gt 0 ] && errdev="/dev/stderr" + + +eecho $eY "Linux-VServer FS Test [V0.14] Copyright (C) 2005-2006 H.Poetzl" + +KERN=`uname -srm` +CHCV=`chcontext --version 2>&1` +CHCO=`echo -e "$CHCV" | + sed -n '/--\|version/ {s/.*\ \([0-9][0-9.]*\).*/\1/g;p;q;}'` + +INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo ''`) +case ${INFO[2]:1:1} in + 0) TAGI="none" ;; + 1) TAGI="uid16" ;; + 2) TAGI="gid16" ;; + 3) TAGI="ugid24" ;; + 4) TAGI="intern" ;; + 5) TAGI="runtime" ;; + *) TAGI="unknown" ;; +esac + +echo "$KERN/$CHCO" +echo "VCI: $INFO ${INFO[1]} ${INFO[2]} ($TAGI)" + +fsl=`echo $FSL | tr ',' ' '` + +for fs in $fsl; do + echo "---" + eecho $eY "testing $fs filesystem ..." + case $fs in + nfs) + do_test nfs "$nfsopt,$mntopt" + continue + ;; + + ext2|ext3) + mkfsopt=""; + testopt="$mntopt"; + ;; + xfs|jfs) + mkfsopt="-f"; + testopt="$mntopt"; + ;; + reiser*) + mkfsopt="-f"; + testopt="attrs,$mntopt" + fs="reiserfs"; + ;; + ocfs2*) + mkfsopt=""; + testopt="$mntopt" + fs="ocfs2"; + ;; + *) + eecho $eR "unknown filesystem $fs." + continue + ;; + esac + + yes | mkfs.$fs $mkfsopt $DEV 1>$outdev 2>$errdev + rc=$?; ececho $rc "[000]" + [ $rc -gt 0 ] && echo "($fs format failed)" && continue + do_test "$fs" "$testopt" + [ $terse -ne 0 ] && echo "" +done + --- util-vserver-0.30.212.orig/debian/examples/testme.sh-0.16 +++ util-vserver-0.30.212/debian/examples/testme.sh-0.16 @@ -0,0 +1,280 @@ +#!/bin/bash + +function cleanup () { + if [ -n "$tmpdir" -a -d "$tmpdir" ]; then + rm -rf "$tmpdir" + fi +} + +trap 'cleanup' EXIT +trap 'exit 4' SIGTERM + +cmddir=`dirname $0` +cmdname=`basename $0` +tmpdir=`mktemp -d /tmp/$cmdname.XXXXXX` + + +eR='\e[31m';eG='\e[32m';eY='\e[33m';eB='\e[34m';eN='\e[0m' + +function eecho () { + C=$1; shift + echo -e "$C$*$eN" +} + +function ececho () { + rc=$1; shift + id=$1; shift + if [ $rc -eq 0 ]; then + eecho $eG "$id succeeded." + else + eecho $eR "$id failed." + fi +} + +function vlc () { + [ $verbose -gt $1 ] + return $? +} + + +function eexec () { + local id=`printf "[%3.3s]#" $1`; shift + local eret=$1; shift + vlc 0 && eecho $eB "$id $*" + if vlc 1; then + eval $* + else + eval $* >/dev/null 2>&1 + fi + local ret=$? + [ -n "$eret" -a "$eret" -ne 0 ] \ + && ret=$(( ret - eret )) + ececho $ret $id + return $ret +} + +function iwhich () { + local dpath=`type -p $1` + echo "$dpath" + [ -n "$dpath" ] +} + +export -f iwhich + +function trigger () { + local id="$1"; shift + eexec "L$id" 0 "chcontext $SID 456$id bash -c $@" + [ -z "$DYC" ] && eexec "D$id" 0 "chcontext bash -c $@" +} + + +verbose=0 +while getopts ":hqvA:L" option; do + case $option in + h) # help + cat << EOF +Usage: $cmdname [OPTION]... + + -h help + -q quick test + -v be verbose + -A [ARCH] architecture specific tests + -L limit tests (triggers) + +examples: + + $cmdname -q # quick test + $cmdname -v # verbose test + +EOF + exit 0 + ;; + q) # just do quick tests + quick=1 + ;; + v) # be verbose + verbose=$(( verbose + 1 )) + ;; + A) # architecture specific + arch="$OPTARG" + ;; + L) # limit tests (triggers) + ltrig=1 + ;; + esac +done +shift $(($OPTIND - 1)) + +eecho $eY "Linux-VServer Test [V0.16] Copyright (C) 2003-2006 H.Poetzl" + +for util in vserver chcontext chbind bash; do + if [ -z `iwhich $util` ]; then + eecho $eR "utility '$util' could not be found." + exit 1 + fi +done + +KERN=`uname -srvm` +VSRV=`iwhich vserver 2>/dev/null` + +if [ -n "$VSRV" ]; then + VDIR=`dirname $VSRV`; +else + if [ -d /usr/lib/util-vserver ]; then + VDIR="/usr/lib/util-vserver" + else + VDIR="/usr/lib/vserver" + fi +fi + +grep -q TELL_UNSAFE_CHROOT `iwhich chcontext` +rc1=$? +grep -q util-vserver `iwhich chcontext` +rc2=$? + +[ $rc1 -eq 0 -o $rc2 -eq 0 ] && TYPE="E" || TYPE="J" + +if chcontext --xid 1 -- true >/dev/null 2>&1; then + SID="--xid"; +else + SID="--ctx"; +fi + +if chcontext -- true >/dev/null 2>&1; then + DYC=""; DYN=""; +elif chcontext true >/dev/null 2>&1; then + DYC=""; DYN=""; TYPE="Jo" +else + DYC="$SID 49151"; + DYN="--nid 49151"; +fi + +echo -en $eR +out=`chcontext $SID 1 grep -Ee '[[]|s_context|VxID' /proc/self/status` +rc=$? +if [ $rc -eq 0 ]; then + echo -en $eG + echo "chcontext is working." + vlc 1 && echo $out | grep -v '^$' +else + echo "chcontext failed!" + echo $out | grep -v '^$' + chc_fail=1 +fi +echo -en $eN + +echo -en $eR +out=`chbind $DYN --ip 127.0.0.1 grep 'ipv4' /proc/self/status` +rc=$? +if [ $rc -ne 0 ]; then + out=`chbind $DYN --ip 127.0.0.1 grep 'V4Root\[0\]:' /proc/self/ninfo` + rc=$? +fi + +if [ $rc -eq 0 ]; then + echo -en $eG + echo "chbind is working." + vlc 1 && echo $out | grep -v '^$' +else + echo "chbind failed!" + echo $out | grep -v '^$' + chb_fail=1 +fi +echo -en $eN +vlc 1 && echo $out + +CHCV=`chcontext --version 2>&1` +if [ $? -eq 0 ]; then + TYPE="Ea"; +fi +CHBV=`chbind --version 2>&1` + +CHCO=`echo -e "$CHCV" | + sed -n '/--\|version/ {s/.*\ \([0-9][0-9.]*\).*/\1/g;p;q;}'` +CHBI=`echo -e "$CHBV" | + sed -n '/--\|version/ {s/.*\ \([0-9][0-9.]*\).*/\1/g;p;q;}'` +vlc 0 && echo -e "$CHCV" + +KTNT=`cat /proc/sys/kernel/tainted 2>/dev/null` +[ $KTNT -ne 0 ] && KINF="${KINF}Kt" + +INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo ''`) +VSRI=`vserver-info - SYSINFO 2>/dev/null || echo ''` + +echo "$VSRI" | grep -q 'dietlibc: yes' && UINF="${UINF}D" +APIS=`echo "$VSRI" | sed -n '/APIs/ {s/.*: //;p;q;}'` +SYSC=(`echo "$VSRI" | sed -n '/syscall/ {s/.*: //;p;}'`) + +KCIN=$[ 16#${INFO[2]} ]; +KCTG=$[ (KCIN >> 24) & 7 ]; + +KClgacy=$[ (KCIN >> 1) & 1 ]; +KClgnet=$[ (KCIN >> 2) & 1 ]; +KCngnet=$[ (KCIN >> 3) & 1 ]; +KCprocs=$[ (KCIN >> 4) & 1 ]; + +case $KCTG in + 0) KINF="${KINF}Tn" ;; + 1) KINF="${KINF}Tu" ;; + 2) KINF="${KINF}Tg" ;; + 3) KINF="${KINF}Tb" ;; + 4) KINF="${KINF}Ti" ;; + 5) KINF="${KINF}Tr" ;; + *) KINF="${KINF}T*" ;; +esac + +[ $[ (KCIN >> 1) & 1 ] -ne 0 ] && KINF="${KINF}Lg" +[ $[ (KCIN >> 2) & 1 ] -ne 0 ] && KINF="${KINF}n" +[ $[ (KCIN >> 3) & 1 ] -ne 0 ] && KINF="${KINF}N" +[ $[ (KCIN >> 4) & 1 ] -ne 0 ] && KINF="${KINF}P" + +[ $[ (KCIN >> 16) & 1 ] -ne 0 ] && KINF="${KINF}D" + +case ${SYSC[0]} in + alternative) UINF="${UINF}Sa" ;; + traditional) UINF="${UINF}St" ;; + glibc) UINF="${UINF}Sg" ;; + *) UINF="${UINF}S*" ;; +esac + + +echo "$KERN" +echo "$TYPE $CHCO ${SYSC[1]} ($UINF) <$APIS>" +echo "VCI:" ${INFO[*]} "($KINF)" + +vlc 0 && sed 's/^[^(]*\((.*)\)\(.*\)$/\1\2/; s/) /)\n/g' /proc/version +echo "---" + +if [ -n "$quick" -o -n "$chb_fail" -o -n "$chc_fail" ]; then + [ -z "$chb_fail" -a -z "$chc_fail" ] && exit 0 + [ -n "$chb_fail" -a -n "$chc_fail" ] && exit 3 + [ -n "$chb_fail" ] && exit 2 + exit 1 +fi + +UXID=45678 + +eexec 000 0 "chcontext $DYC true && chcontext $SID $UXID true" +eexec 001 0 "chcontext $SID $UXID egrep 'context|VxID' /proc/self/status" +eexec 011 1 "chcontext --secure $SID $UXID mknod $tmpdir/node c 0 0" +eexec 031 0 "chcontext $DYC --hostname zaphod.$$ uname -a | grep -q zaphod.$$" + +eexec 101 0 "chbind $DYN --ip 192.168.0.42 true" +eexec 102 0 "chbind $DYN --ip 192.168.0.1/255.255.255.0 --ip 10.0.0.1/24 true" + +eexec 201 0 "chcontext $SID $UXID --flag fakeinit bash -c 'test \$\$ -eq 1'" +eexec 202 0 "chcontext $DYC --flag fakeinit bash -c 'test \$\$ -eq 1'" + +if [ -n "$ltrig" ]; then + echo "---" + trigger 01 "'true &'" + trigger 02 "'true | true'" + trigger 03 "'true & true'" + trigger 11 "'true >/dev/null'" "/dev/null" + trigger 21 "'bash -c \"true &\"&'" + trigger 22 "'bash -c \"false | true &\"&'" + trigger 31 "'echo \`ls\`'" +fi + +exit 0 --- util-vserver-0.30.212.orig/debian/examples/README.TestScripts +++ util-vserver-0.30.212/debian/examples/README.TestScripts @@ -0,0 +1,56 @@ +=============================================================================== + +To be sure that your setup works fine, we got a test script that checks some +basic functionality. So download the [testme.sh] script to check that +everything's fine. + +# Get the script +wget http://vserver.13thfloor.at/Stuff/SCRIPT/testme.sh + +# Make it executable +chmod +x testme.sh + +# Become root +su + +# Run the test script +./testme.sh + +=============================================================================== + +To be sure that your setup works fine, we got a test script that checks some +filesystem functionality. So download the [testfs.sh] script to check that +everything's fine. + +*** Be careful! It might easily reformat your hard disk :) *** + +# Get the script +wget http://vserver.13thfloor.at/Stuff/SCRIPT/testfs.sh + +# Make it executable +chmod +x testfs.sh + +# Make a loopback file +dd bs=1024k count=1024 if=/dev/zero of=1gb.testfile + +# Become root +su + +# Setup the loopback +losetup /dev/loop0 1gb.testfile + +# Run the test script for legacy mode +./testfs.sh -l -t -D /dev/loop0 -M /mnt + +# Run the test script for new-style config +./testfs.sh -t -D /dev/loop0 -M /mnt +If the script shows any errors, feel free to join us on irc (#vserver @ OFTC) +or ask on the mailinglist. If you ask on the mailing list, don't forget to +include your kernel version, the version of the Linux-VServer patch, the +version of util-vserver and of course the output of the test script. + +Permission is granted to copy, distribute and/or modify this document under the +terms of the GNU Free Documentation License, Version 1.2 or any +later version published by the Free Software Foundation. + +=============================================================================== --- util-vserver-0.30.212.orig/debian/util-vserver.default +++ util-vserver-0.30.212/debian/util-vserver.default @@ -0,0 +1,28 @@ +# Any vserver which has $MARK in /etc/vservers//apps/init/mark +# will be started on boot. +MARK=default + +# If ALWAYS_STOP=true, then all vservers are stopped regardless if they +# have $MARK set or not, this is set to true by default because if you +# do not stop your vservers on shutdown, you could be left with an unclean +# filesystem +ALWAYS_STOP=true + +# If AUTO=true, then the vservers with $MARK set will be started on boot +# and stopped on reboot/shutdown. This is the same behavior as invoking +# /etc/init.d/util-vserver start and /etc/init.d/util-vserver stop +# +# NOTE: if ALWAYS_STOP=true (default), then all vservers are stopped +# regardless if AUTO=false. If AUTO=true and ALWAYS_STOP=true, then +# vservers with $MARK are shutdown the 'cleaner' way, and any unmarked +# vservers will be stopped after, due to ALWAYS_STOP +AUTO=true + +# Number of vservers which shall be started in parallel; since most +# initmethods are spending much time time in sleeps, it is safe to +# use a high number here +NUMPARALLEL=6 + +# Start/stop the vservers on tty9, in the background so the rest of the +# boot process will end early +BACKGROUND=off --- util-vserver-0.30.212.orig/debian/po/cs.po +++ util-vserver-0.30.212/debian/po/cs.po @@ -0,0 +1,56 @@ +# Czech translation of util-vserver debconf messages +# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the util-vserver package. +# Miroslav Kure , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: util-vserver\n" +"Report-Msgid-Bugs-To: opal@debian.org\n" +"POT-Creation-Date: 2006-10-07 13:59-0600\n" +"PO-Revision-Date: 2006-11-20 21:46+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "Remove local Linux-Vserver guest configurations?" +msgstr "Odstranit konfiguraci lokálních hostů Linux-Vserveru?" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "" +"Choose this option if you want the /etc/vservers directory, containing your " +"local Linux-Vserver guest configurations, to be removed. If you wish to " +"keep these configurations, do not choose this option." +msgstr "" +"Tuto možnost povolte, pokud si pÅ™ejete odstranit adresář /etc/vservers, ve " +"kterém se nachází vaÅ¡e lokální konfigurace hostů Linux-Vserveru. Chcete-li " +"konfigurace zachovat, volbu zamítnÄ›te." + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "Stop running Linux-Vserver guests?" +msgstr "Zastavit běžící hosty Linux-Vserveru?" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "" +"Running Vserver guests were detected! If you remove util-vserver without " +"stopping these vservers they will continue to run and you will not be able " +"to manage them from the host, unless you reinstall util-vserver. Choose " +"this option to stop any running Vserver guests now, otherwise they will " +"continue to run." +msgstr "" +"Byli rozpoznáni běžící hosté Vserveru! Odstraníte-li util-vserver aniž byste " +"tyto hosty zastavili, poběží hosté dál, ale nebudete je moci nijak ovládat z " +"hostitelského systému. (Dokud znovu nenainstalujete util-vserver.) Pro " +"zastavení vÅ¡ech běžících hostů Vserveru odpovÄ›zte na tuto otázku kladnÄ›, " +"protože jinak hosté poběží dál." --- util-vserver-0.30.212.orig/debian/po/POTFILES.in +++ util-vserver-0.30.212/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] util-vserver.templates --- util-vserver-0.30.212.orig/debian/po/de.po +++ util-vserver-0.30.212/debian/po/de.po @@ -0,0 +1,56 @@ +# Translation of util-vserver debconf templates to German +# Copyright (C) Helge Kreutzmann , 2006. +# This file is distributed under the same license as the util-vserver package. +# +msgid "" +msgstr "" +"Project-Id-Version: util-vserver\n" +"Report-Msgid-Bugs-To: opal@debian.org\n" +"POT-Creation-Date: 2006-10-07 13:59-0600\n" +"PO-Revision-Date: 2006-11-05 11:07+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "Remove local Linux-Vserver guest configurations?" +msgstr "Entferne lokale Linux-Vserver Gäste-Konfigurationen?" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "" +"Choose this option if you want the /etc/vservers directory, containing your " +"local Linux-Vserver guest configurations, to be removed. If you wish to " +"keep these configurations, do not choose this option." +msgstr "" +"Wählen Sie diese Option, falls Sie möchten, dass das /etc/vservers-" +"Verzeichnis, das Ihre lokalen Linux-Vserver-Gast-Konfigurationen enthält, " +"entfernt werden soll. Falls Sie diese Konfigurationen behalten möchten, " +"wählen Sie diese Option nicht." + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "Stop running Linux-Vserver guests?" +msgstr "Laufende Linux-Vserver-Gäste anhalten?" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "" +"Running Vserver guests were detected! If you remove util-vserver without " +"stopping these vservers they will continue to run and you will not be able " +"to manage them from the host, unless you reinstall util-vserver. Choose " +"this option to stop any running Vserver guests now, otherwise they will " +"continue to run." +msgstr "" +"Es wurden laufende Vserver-Gäste erkannt! Falls Sie util-vserver entfernen, " +"ohne diese Vserver zu beenden, werden diese weiterlaufen und Sie werden nicht " +"in der Lage sein, sie von diesem Rechner aus zu verwalten, es sei den, Sie " +"installieren util-vserver erneut. Wählen Sie diese Option, um alle laufenden " +"Vserver-Gäste jetzt zu beenden, andernfalls werden sie weiterlaufen." --- util-vserver-0.30.212.orig/debian/po/fr.po +++ util-vserver-0.30.212/debian/po/fr.po @@ -0,0 +1,58 @@ +# translation of fr.po to French +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Florentin Duneau , 2006. +msgid "" +msgstr "" +"Project-Id-Version: util-vserver\n" +"Report-Msgid-Bugs-To: opal@debian.org\n" +"POT-Creation-Date: 2006-10-07 13:59-0600\n" +"PO-Revision-Date: 2006-04-10 12:19+0200\n" +"Last-Translator: Florentin Duneau \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "Remove local Linux-Vserver guest configurations?" +msgstr "" +"Faut-il supprimer les configurations locales des serveurs Linux-Vserver ?" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "" +"Choose this option if you want the /etc/vservers directory, containing your " +"local Linux-Vserver guest configurations, to be removed. If you wish to " +"keep these configurations, do not choose this option." +msgstr "" +"Choisissez cette option si vous voulez supprimer le répertoire de " +"configuration /etc/vservers des serveurs Linux-Vserver. Si vous souhaitez " +"garder ces fichiers de configuration, ne choisissez pas cette option." + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "Stop running Linux-Vserver guests?" +msgstr "Faut-il arrêter les serveurs Linux-Vserver ?" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "" +"Running Vserver guests were detected! If you remove util-vserver without " +"stopping these vservers they will continue to run and you will not be able " +"to manage them from the host, unless you reinstall util-vserver. Choose " +"this option to stop any running Vserver guests now, otherwise they will " +"continue to run." +msgstr "" +"Des serveurs Linux-Vserver actifs ont été détectés. Si vous supprimez util-" +"vserver sans les arrêter, ils continueront à s'exécuter et vous ne pourrez " +"pas les contrôler depuis cet hôte à moins de réinstaller util-vserver. " +"Choisissez cette option pour arrêter tous les serveurs Linux-Vserver actifs " +"à cet instant, sinon ils continueront à s'exécuter." --- util-vserver-0.30.212.orig/debian/po/templates.pot +++ util-vserver-0.30.212/debian/po/templates.pot @@ -0,0 +1,49 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: opal@debian.org\n" +"POT-Creation-Date: 2006-10-07 13:59-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "Remove local Linux-Vserver guest configurations?" +msgstr "" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:1001 +msgid "" +"Choose this option if you want the /etc/vservers directory, containing your " +"local Linux-Vserver guest configurations, to be removed. If you wish to " +"keep these configurations, do not choose this option." +msgstr "" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "Stop running Linux-Vserver guests?" +msgstr "" + +#. Type: boolean +#. Description +#: ../util-vserver.templates:2001 +msgid "" +"Running Vserver guests were detected! If you remove util-vserver without " +"stopping these vservers they will continue to run and you will not be able " +"to manage them from the host, unless you reinstall util-vserver. Choose " +"this option to stop any running Vserver guests now, otherwise they will " +"continue to run." +msgstr "" --- util-vserver-0.30.212.orig/debian/README.Debian +++ util-vserver-0.30.212/debian/README.Debian @@ -0,0 +1,40 @@ +Util-vserver for Debian: +------------------------ + +FHS compliance: +=============== + +On a default installation of util-vserver vservers are stored in: +/var/lib/vservers + +The reason for this is to comply with Debian policy that enforce the +directory structure specified by FHS and LSB. + +If you need to change that location and use the legacy mode you have to change +the variable DEFAULT_VSERVERDIR in /etc/vservers/util-vserver-vars to point +to the directory where you choose to locate your vservers. + +If you use the normal mode for vservers you have to change the +/etc/vservers/.defaults/vdirbase symlink to point to the correct directory. +You can also change the symlink for each vserver specifically. + +SECURITY notice: +================ + +If you cannot store all your vservers in the same place in the filesystem, +do *not* symlink them from the /var/lib/vservers directory, but instead +redirect the vdir symlink in /etc/vservers//vdir instead. + + +Filesystem options: +=================== + +For reiserfs, "attrs" must be added as a mount option. +Extended attributes for the filesystem doesn't have to be set in the kernel. + +If not you will see this when installing/upgrading: + + lsattr: Inappropriate ioctl for device While reading flags on + /var/lib/vservers/ + + -- Ola Lundqvist , Fri, 7 Jan 2005 18:20:04 +0100 --- util-vserver-0.30.212.orig/debian/watch +++ util-vserver-0.30.212/debian/watch @@ -0,0 +1,3 @@ +version=2 + +http://ftp.linux-vserver.org/pub/utils/util-vserver/ util-vserver-(.*)\.tar\.gz --- util-vserver-0.30.212.orig/man/vserver-build.8 +++ util-vserver-0.30.212/man/vserver-build.8 @@ -0,0 +1,228 @@ +.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14 +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sh \" Subsection heading +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. | will give a +.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to +.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' +.\" expand to `' in nroff, nothing in troff, for use with C<>. +.tr \(*W-|\(bv\*(Tr +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.\" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.hy 0 +.if n .na +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "VSERVER-BUILD 8" +.TH VSERVER-BUILD 8 "2005-07-31" "util-vserver" "util-vserver" +.SH "NAME" +vserver\-build \- build new vserver with vserver ... build +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +vserver vserver-name build \-m [options] [cfg\-options] + [\-\-] [method\-args] +.SH "METHODS" +.IX Header "METHODS" +Possible methods are: +.PP +\&\fBlegacy\fR the \*(L"old\*(R" copy-all-from-host method, which requires the + old legacy vserver-legacy script; with this method + the cfg-options will be ignored +.PP +\&\fBcopy\fR the copy-all-from-host method which uses the recent + configuration scheme +.PP +\&\fBapt-rpm\fR ... \*(-- \-d + installs the base-packages of the given distribution with + help of 'vapt\-get' +.PP +\&\fByum\fR ... \*(-- \-d + installs the base-packages of the given distribution with + help of 'vyum' +.PP +\&\fBrpm\fR ... \*(-- [\-d ] + \-\-empty | ([\-\-force] [\-\-nodeps] )+ + installs lists of rpm-packages +.PP +\&\fBskeleton\fR ... \*(-- [ *] + installs a minimal skeleton filesystem, creates the + configuration file and calls an optional command then +.PP +\&\fBdebootstrap\fR ... \*(-- \-d [\-m ] [\-\- *] + bootstraps the vserver with Debian's 'debootstrap' package +.SH "OPTIONS" +.IX Header "OPTIONS" +\&\fB\-\-force\fR remove/rename already existing vservers with the same name +.PP +\&\fB\-\-rootdir\fR + vserver root directory [default: /vservers] +.PP +\&\fB\-\-pkgbase\fR + package base directory [default: /vservers/.pkg] +.SH "CFG-OPTIONS" +.IX Header "CFG-OPTIONS" +\&\fB\-\-context\fR the static context of the vserver [default: none; a dynamic + context will be assumed] +.PP +\&\fB\-\-confdir\fR vserver-specific configuration directory + [default: /etc/vservers/] +.PP +\&\fB\-\-lockfile\fR + lock file [default: /var/run/vservers/] +.PP +\&\fB\-\-hostname\fR +.PP +\&\fB\-\-netdev\fR +.PP +\&\fB\-\-netbcast\fR +.PP +\&\fB\-\-netmask\fR | \-\-netprefix + sets the default netmask (a.b.c.d quadruple) or prefixlen + (length of the interface) +.PP +\&\fB\-\-interface\fR [=][:][/] + declares an network\-interface; this option can be specified + multiple times +.PP +\&\fB\-\-flags\fR + + sets comma-separated list of flags; possible flags are + lock: Prevent the vserver from setting new security + context + sched: Merge scheduler priority of all processes in the + vserver so that it acts a like a single + one (kernel 2.4 only). + nproc: Limit the number of processes in the vserver + according to ulimit (instead of a per user limit, + this becomes a per vserver limit) + private: No other process can join this security context. + Even root +.PP +\&\fB\-\-initstyle\fR