# ChangeLog for sys-cluster/util-vserver
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.34 2005/11/26 09:25:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.35 2005/11/26 09:44:04 hollow Exp $
+
+ 26 Nov 2005; Benedikt Boehm <hollow@gentoo.org> -files/vprocunhide,
+ -files/vserver-new_dev-fix.patch,
+ -files/vserver-new_drop-defaulttar.patch, -files/vservers.confd,
+ -files/vservers.initd, -util-vserver-0.30.205-r1.ebuild,
+ util-vserver-0.30.208-r5.ebuild, util-vserver-0.30.209.ebuild:
+ 208-r5 to stable x86; cleanup
26 Nov 2005; Christian Heim <phreak@gentoo.org>
-util-vserver-0.30.208-r3.ebuild, -util-vserver-0.30.208-r4.ebuild,
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 3f22d55034f9ec88668904d5d83cbe5a ChangeLog 6736
-MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
+MD5 e13885afb2c793316d8d88d289307c54 ChangeLog 7066
MD5 0722ed435a03b8e1c03b0b319045891c files/digest-util-vserver-0.30.208-r5 157
MD5 2c8a53015c77a0f7222ab5e18ca59246 files/digest-util-vserver-0.30.209 154
-MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
-MD5 bb0aa3e0f3b2d4216d303bd8ff6ebcb4 files/vserver-new_dev-fix.patch 393
-MD5 5e3714a49fe3701ba1d3e5a0c210f888 files/vserver-new_drop-defaulttar.patch 840
-MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
-MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
-MD5 c5f348ce535b90b26e953ef356181e1d util-vserver-0.30.205-r1.ebuild 1946
-MD5 c4f21ce40342f7b4a6ab561de19df27e util-vserver-0.30.208-r5.ebuild 2603
-MD5 5d6b7d306af2ed8b3447c9d0f7df8205 util-vserver-0.30.209.ebuild 2588
+MD5 9c501f34aa38e4a86f7b08ff6f91a594 util-vserver-0.30.208-r5.ebuild 2915
+MD5 b4069ef9a990ff4e2e6352f004f3db16 util-vserver-0.30.209.ebuild 2901
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDiCoAflZ8QqxhrsMRAtYqAKCXruguMm7o75uhbtdmGdboPSTZYwCgqsJv
-wPQCWuEw9aVWXSN2cmMprDA=
-=vh2l
+iD8DBQFDiC5xmPFBzbX68WERAp7aAKCNMx3c1TZ9OHeWzpVR8Q8gViq/3QCdG5cc
+GxgnnEMtXDl4+nuMqEISv50=
+=N+uJ
-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 9d509327744fd5dfa84faa68531853c3 util-vserver-0.30.205.tar.bz2 556725
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vprocunhide,v 1.3 2005/07/18 15:27:15 hollow Exp $
-
-start() {
- : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
- if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
- eerror "Cannot find util-vserver installation"
- eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
- exit 1
- fi
- . ${UTIL_VSERVER_VARS}
-
- ebegin "Unhiding /proc entries"
- ${_VPROCUNHIDE}
- eend $?
-}
+++ /dev/null
---- tools/vserver-new.old 2005-10-01 18:58:31.580500000 +0200
-+++ tools/vserver-new 2005-10-01 18:57:19.179975250 +0200
-@@ -244,6 +244,7 @@
- cp -L /etc/resolv.conf etc/resolv.conf || die "failed to copy DNS information"
-
- mount -t proc none proc/ || die "failed to mount procfs"
-+ mount --bind /dev dev/ || die "failed to mount dev"
-
- cat <<EOF > tmp/vserver-new-stage3.sh
- #!/bin/bash
+++ /dev/null
---- tools/vserver-new.old 2005-10-04 16:34:08.818098750 +0200
-+++ tools/vserver-new 2005-10-04 16:26:13.416388000 +0200
-@@ -186,9 +186,6 @@
- # Target: stage3 #
- #------------------------------------------------------------------------------#
-
--STAGE3_DEFAULTTAR="stage3-i686-latest.tar.bz2"
--STAGE3_DEFAULTURL="http://dev.gentoo.org/~hollow/vserver/stages/${STAGE3_DEFAULTTAR}"
--
- stage3_usage() {
- echo "Usage: vserver-new <name> <globalopts> stage3 [<tar>]"
- echo
-@@ -205,10 +202,10 @@
- exit 0
- fi
-
-- if [ -n "$1" ]; then
-- tarball=$1
-- [ "${tarball#/}" == "${tarball}" ] && tarball="`pwd`/${tarball}"
-- fi
-+ [ -z "$1" ] && die "Missing required argument <tar>"
-+
-+ tarball=$1
-+ [ "${tarball#/}" == "${tarball}" ] && tarball="`pwd`/${tarball}"
-
- stage3_build
- }
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.confd,v 1.3 2005/07/19 16:32:12 hollow Exp $
-
-# A space-delimited list of vserver MARKS to start.
-# Identification of vservers happens by
-# putting the flavor into /etc/vservers/<vserver-id>/apps/init/mark.
-MARKS="default"
-
-# Wether to start all vservers by default (supersedes MARKS)
-# This will be enabled if STARTALL is set regardless of its content
-# i.e. you have to comment to disable it
-#STARTALL=yes
-
-# Wether to stop all vservers by default (supersedes MARKS)
-# This will be enabled if STOPALL is set regardless of its content
-# i.e. you have to comment to disable it
-STOPALL=yes
-
-# Number of vservers which shall be started in parallel; since most
-# initmethods are spending much time in sleeps, it is safe to
-# use a high number here, though you should pay attention if you make
-# use of depends in /etc/vservers as some services may not be up if
-# started in parallel
-#NUMPARALLEL=6
-
-# The name of the vserver lock directory which is used by the init script
-# to determine which MARKS have already been started (used within
-# vstatus() to show the status of MARKS). Default should be good
-# for everyone. Change at your own risk
-#LOCKDIR=/var/lock/vservers
-
-# The location of util-vserver-vars
-# This file contains variables to util-vserver scripts used within the
-# init script. Change at your own risk.
-#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.initd,v 1.3 2005/07/18 15:27:15 hollow Exp $
-
-opts="${opts} vstatus"
-
-checkconfig() {
- : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
- if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
- eerror "Cannot find util-vserver installation"
- eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
- exit 1
- fi
- . ${UTIL_VSERVER_VARS}
-
- : ${MARKS:=default}
- : ${NUMPARALLEL:=1}
- : ${LOCKDIR:=/var/lock/vservers}
-}
-
-start() {
- checkconfig
-
- if [[ -n ${STARTALL} ]]; then
- ebegin "Starting all vservers"
- ${_START_VSERVERS} -j ${NUMPARALLEL} --all --start
- local rc=$?
- [[ $rc -eq 0 ]] && touch ${LOCKDIR}/all
- eend $rc
- else
- for MARK in ${MARKS}; do
- ebegin "Starting vservers of type '${MARK}'"
- ${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --start
- local rc=$?
- [[ $rc -eq 0 ]] && touch ${LOCKDIR}/${MARK}
- eend $rc
- done
- fi
-}
-
-stop() {
- checkconfig
-
- if [[ -n ${STOPALL} ]]; then
- ebegin "Stopping all vservers"
- ${_START_VSERVERS} -j ${NUMPARALLEL} --all --stop
- local rc=$?
- rm -f ${LOCKDIR}/all
- eend $rc
- else
- for MARK in ${MARKS}; do
- ebegin "Stopping vservers of type '${MARK}'"
- ${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --stop
- local rc=$?
- rm ${LOCKDIR}/${MARK}
- eend $rc
- done
- fi
-
-}
-
-vstatus() {
- checkconfig
-
- einfo "${LOCKDIR} shows the follwing types of vservers running:"
- for i in ${LOCKDIR}/*; do
- einfo " ${i}"
- local running="true"
- done
-
- if [[ "${running}" != "true" ]]; then
- einfo " none"
- fi
-}
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild,v 1.7 2005/10/02 19:19:08 phreak Exp $
-
-inherit eutils
-
-DESCRIPTION="Linux-VServer admin utilities"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="glibc"
-DEPEND="!glibc? ( >=dev-libs/dietlibc-0.26-r1 )
- glibc? ( sys-libs/glibc )
- sys-apps/iproute2
- net-misc/vconfig
- sys-process/procps
- net-firewall/iptables"
-
-src_compile() {
- local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
-
- use glibc && myconf="${myconf} --disable-dietlibc"
-
- econf ${myconf} || die "econf failed"
- emake || die "compile failed"
-}
-
-src_install() {
- emake DESTDIR=${D} install || die "install failed"
-
- # keep dirs
- keepdir /var/run/vservers
- keepdir /var/run/vservers.rev
- keepdir /var/run/vshelper
- keepdir /var/lock/vservers
- keepdir /vservers
-
- # remove the non-gentoo init-scripts:
- rm -f ${D}/etc/init.d/*
-
- # and install gentoo'ized ones:
- exeinto /etc/init.d/
- newexe ${FILESDIR}/vservers.initd vservers
- newexe ${FILESDIR}/vprocunhide vprocunhide
-
- # install conf.d files
- insinto /etc/conf.d
- newins ${FILESDIR}/vservers.confd vservers
-
- dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
-}
-
-pkg_postinst() {
- einfo
- einfo "You have to run the vprocunhide command after every reboot"
- einfo "in order to setup /proc permissions correctly for vserver"
- einfo "use. An init script is provided by this package. To use it"
- einfo "you should add it to a runlevel:"
- einfo
- einfo " rc-update add vprocunhide default"
- einfo
-
- ewarn "You should definitly fix up the barrier of your /vserver"
- ewarn "basedir by using the following command in a root shell: "
- ewarn
- ewarn " setattr --barrier /vservers"
- ewarn
-}
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.2 2005/11/26 09:25:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.3 2005/11/26 09:44:04 hollow Exp $
inherit autotools eutils toolchain-funcs
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
ewarn
ewarn " setattr --barrier ${VDIRBASE}"
ewarn
+ ewarn "IMPORTANT UPGRADE WARNING:"
+ ewarn
+ ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
+ ewarn "with the vservers init script. The following steps are"
+ ewarn "required to keep current behaviour:"
+ ewarn
+ ewarn " rc-update del vprocunhide"
+ ewarn " rc-update add vserver default"
+ ewarn
}
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild,v 1.2 2005/11/26 09:25:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild,v 1.3 2005/11/26 09:44:04 hollow Exp $
inherit autotools eutils toolchain-funcs
ewarn
ewarn " setattr --barrier ${VDIRBASE}"
ewarn
+ ewarn "IMPORTANT UPGRADE WARNING:"
+ ewarn
+ ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
+ ewarn "with the vservers init script. The following steps are"
+ ewarn "required to keep current behaviour:"
+ ewarn
+ ewarn " rc-update del vprocunhide"
+ ewarn " rc-update add vserver default"
+ ewarn
}
projects / gentoo.git / commitdiff