misc fixes + vserver build script

(Portage version: 2.0.51.22-r1)

6 files changed, 219 insertions, 12 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 2fc00544a584..327f1f757e21 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.21 2005/07/18 15:27:15 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.22 2005/08/03 18:33:37 hollow Exp $
+
+*util-vserver-0.30.208-r1 (03 Aug 2005)
+
+  03 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.30.208-r1/vservers.confd, +files/0.30.208-r1/vservers.initd,
+  +util-vserver-0.30.208-r1.ebuild:
+  misc fixes + features
 
 *util-vserver-0.30.208 (18 Jul 2005)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 4f5a3abb3ace..a101ccad5de5 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2f6a05c20b55e64025ca50105c9b792c ChangeLog 4163
+MD5 bb066866bbc81615bfac153cffbd1dba ChangeLog 4387
 MD5 b55bfb88b955107a0f0e6c5aaef21723 metadata.xml 162
 MD5 63305730c069d9dbe9776caaf1a4150e util-vserver-0.30.205-r1.ebuild 1926
 MD5 a7c1cab65b8e8af19ee8951c484e4948 util-vserver-0.30.207.ebuild 1962
 MD5 fa2efdab74039371d79f859843ac0f1f util-vserver-0.30.208.ebuild 1962
+MD5 0a6a279e0ece63ab542e4bbe3aa13d1b util-vserver-0.30.208-r1.ebuild 2241
 MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
 MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
 MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
 MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
 MD5 e9f396453e3aeb9f364489b7baec4238 files/digest-util-vserver-0.30.207 74
+MD5 199ea59779f458439e1500eecffbe3c3 files/digest-util-vserver-0.30.208-r1 154
 MD5 0fb2840471aeb47987109d913eb11413 files/digest-util-vserver-0.30.208 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC6npomPFBzbX68WERAvy0AKCArSPG7kpIvOF8hN2G/0rU+X7KTwCeN0fa
-SUw8U3ogZxb17RxvB3jiemY=
-=YH38
------END PGP SIGNATURE-----
+MD5 85bff408ca3a695724727432f5558839 files/0.30.208-r1/vservers.confd 1685
+MD5 d068d26f98821bf6c648723ac32b44d7 files/0.30.208-r1/vservers.initd 1826
diff --git a/sys-cluster/util-vserver/files/0.30.208-r1/vservers.confd b/sys-cluster/util-vserver/files/0.30.208-r1/vservers.confd
new file mode 100644
index 000000000000..a97ee5478833
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.208-r1/vservers.confd
@@ -0,0 +1,40 @@
+# 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/0.30.208-r1/vservers.confd,v 1.1 2005/08/03 18:33:37 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"
+
+# A space-delimited list of vservers to start
+# This can be used together with MARKS or as a replacement
+#START_VSERVERS=""
+
+# 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
diff --git a/sys-cluster/util-vserver/files/0.30.208-r1/vservers.initd b/sys-cluster/util-vserver/files/0.30.208-r1/vservers.initd
new file mode 100644
index 000000000000..02ae73bd2e95
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.208-r1/vservers.initd
@@ -0,0 +1,81 @@
+#!/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/0.30.208-r1/vservers.initd,v 1.1 2005/08/03 18:33:37 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
+		
+		for VSERVER in ${START_VSERVERS}; do
+			ebegin "Starting vserver '${VSERVER}'"
+			${_VSERVER} ${VSERVER} start
+			eend $?
+		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
+}
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r1
new file mode 100644
index 000000000000..78d53117d2df
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r1
@@ -0,0 +1,2 @@
+MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
+MD5 a0503290da8efeb4014e651d3fc040f8 util-vserver-0.30.208-gentoo.tar.bz2 16188
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild
new file mode 100644
index 000000000000..8c1aa5da58a7
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild
@@ -0,0 +1,83 @@
+# 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-r1.ebuild,v 1.1 2005/08/03 18:33:37 hollow Exp $
+
+inherit eutils
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
+	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="glibc crypt"
+DEPEND="!glibc? ( >=dev-libs/dietlibc-0.27 )
+		glibc? ( sys-libs/glibc )
+		sys-apps/iproute2
+		net-misc/vconfig
+		crypt? ( dev-libs/beecrypt )
+		net-firewall/iptables"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	epatch ${WORKDIR}/patches/*.patch
+}
+
+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}/0.30.208-r1/vservers.initd vservers
+	newexe ${FILESDIR}/vprocunhide vprocunhide
+
+	# install conf.d files
+	insinto /etc/conf.d
+	newins ${FILESDIR}/0.30.208-r1/vservers.confd vservers
+
+	# install vserver build script for gentoo guests
+	dosbin ${WORKDIR}/tools/vserver-new
+
+	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
+}