added vprocunhide init script, small fixes

(Portage version: 2.0.51.19)

7 files changed, 208 insertions, 11 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 9a284711340e..b6fc5f612092 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.17 2005/03/30 11:43:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.18 2005/04/07 14:23:52 hollow Exp $
+
+*util-vserver-0.30.205-r1 (07 Apr 2005)
+
+  07 Apr 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.30.205/vservers.confd, +files/0.30.205/vprocunhide,
+  +files/0.30.205/vservers.initd, +util-vserver-0.30.205-r1.ebuild:
+  added vprocunhide init script, small fixes
 
 *util-vserver-0.30.205 (30 Mar 2005)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index cb4bd93bb028..03aba3cbd95d 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,20 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a11aff37eda36944e77cffd07dbfccc0 ChangeLog 2992
 MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
 MD5 3d6eec0e3d10c7a6e4a95e448c03a06e util-vserver-0.30.196.ebuild 1268
 MD5 5eb10d9678fd96a1f56d1eb157b3994a util-vserver-0.30.204.ebuild 1285
 MD5 5460093cd5050c0938518baa9a56cb55 util-vserver-0.30.205.ebuild 1284
+MD5 d45119dc13956abafbae0e0c79c056ff util-vserver-0.30.205-r1.ebuild 1753
 MD5 8de53dd957127f3ba125f733c1b7389b files/vservers.initd 1792
 MD5 3d9c604f30a2de02a9fc6e99b4b9aefd files/vservers.confd 1738
 MD5 0f34731a7d8119fc5e3f9322bf727521 files/digest-util-vserver-0.30.196 74
 MD5 12cd58b1dedc5d8f583cf66aad57ac51 files/digest-util-vserver-0.30.204 74
 MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCSpFlmPFBzbX68WERAjO2AKCB1nn18W7Ne28Z9Dwu07vs0HVReACghALZ
-pD97Gy2HJI9eKrmO4nT/T6U=
-=XI2D
------END PGP SIGNATURE-----
+MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
+MD5 49bdcff9db7ec13ad0bba9cbc63e8661 files/0.30.205/vservers.confd 1452
+MD5 532e194aa89f5dace79ac391e650bb24 files/0.30.205/vservers.initd 1692
+MD5 ec93b6abf15bfa24a971afa625c6f056 files/0.30.205/vprocunhide 466
diff --git a/sys-cluster/util-vserver/files/0.30.205/vprocunhide b/sys-cluster/util-vserver/files/0.30.205/vprocunhide
new file mode 100644
index 000000000000..6175b0abbecd
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.205/vprocunhide
@@ -0,0 +1,18 @@
+#!/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/0.30.205/vprocunhide,v 1.1 2005/04/07 14:23:52 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 $?
+}
diff --git a/sys-cluster/util-vserver/files/0.30.205/vservers.confd b/sys-cluster/util-vserver/files/0.30.205/vservers.confd
new file mode 100644
index 000000000000..a3083b80a8ab
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.205/vservers.confd
@@ -0,0 +1,36 @@
+# 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.205/vservers.confd,v 1.1 2005/04/07 14:23:52 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
\ No newline at end of file
diff --git a/sys-cluster/util-vserver/files/0.30.205/vservers.initd b/sys-cluster/util-vserver/files/0.30.205/vservers.initd
new file mode 100644
index 000000000000..10a5aae896ab
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.205/vservers.initd
@@ -0,0 +1,75 @@
+#!/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.205/vservers.initd,v 1.1 2005/04/07 14:23:52 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
+}
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205-r1
new file mode 100644
index 000000000000..67554560bf5b
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205-r1
@@ -0,0 +1 @@
+MD5 9d509327744fd5dfa84faa68531853c3 util-vserver-0.30.205.tar.bz2 556725
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
new file mode 100644
index 000000000000..b0d06ff6e2ce
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.1 2005/04/07 14:23:52 hollow 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
+		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}/${PV}/vservers.initd vservers
+	newexe ${FILESDIR}/${PV}/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. A 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
+}
\ No newline at end of file