fix vshelper + barrier warning

(Portage version: 2.0.51.22-r1)

7 files changed, 34 insertions, 26 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 36548875417b..53787e94515d 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.19 2005/05/17 11:24:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.20 2005/06/12 09:43:54 hollow Exp $
+
+  12 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.30.205/vshelper-shutdown-hack, util-vserver-0.30.207.ebuild:
+  fix vshelper + barrier warning
 
 *util-vserver-0.30.207 (17 May 2005)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index d840584d1b07..1a6eed477a69 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,27 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f22606a0669159d984a2aeb308a4e489 ChangeLog 3397
+MD5 37e875e2778c77310a84b1193421b18e ChangeLog 3553
 MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
 MD5 3d6eec0e3d10c7a6e4a95e448c03a06e util-vserver-0.30.196.ebuild 1268
 MD5 5eb10d9678fd96a1f56d1eb157b3994a util-vserver-0.30.204.ebuild 1285
+MD5 0218885cdfe20b6a88817779daecc373 util-vserver-0.30.205-r1.ebuild 1763
 MD5 5460093cd5050c0938518baa9a56cb55 util-vserver-0.30.205.ebuild 1284
-MD5 ffa3b0d66e0441fd8868b1c668acf50f util-vserver-0.30.205-r1.ebuild 1762
-MD5 79b21ee42f1c59c4dce8c765fc6a860f util-vserver-0.30.207.ebuild 1805
+MD5 faf2abed3ef792dfd82e0dd902befe78 util-vserver-0.30.207.ebuild 2288
+MD5 35078d86b965189f4b307fc437c8f87e files/vservers.confd 1739
 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-r1 74
 MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205 74
 MD5 e9f396453e3aeb9f364489b7baec4238 files/digest-util-vserver-0.30.207 74
-MD5 f9ebb7b968fe2b8e12d28dbf1e388870 files/0.30.205/vservers.confd 1568
-MD5 acd935ab2632dfa0f2213d11b0025f97 files/0.30.205/vservers.initd 1701
 MD5 4096356a4cb49d0ec50eee25c925d24f files/0.30.205/vprocunhide 579
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCildumPFBzbX68WERAscdAJ9ZyGWNZTiJcnJM6hs9sLlz7RKMtQCeNuhd
-5x1/xW8jpi6hmPoB+5sTgtQ=
-=uAFv
------END PGP SIGNATURE-----
+MD5 35158e609b6c936bd79c7f8a4e38e233 files/0.30.205/vservers.confd 1569
+MD5 acd935ab2632dfa0f2213d11b0025f97 files/0.30.205/vservers.initd 1701
+MD5 16d2c34a9a86dbb4ffa033a2969c6c39 files/0.30.205/vshelper-shutdown-hack 12
diff --git a/sys-cluster/util-vserver/files/0.30.205/vservers.confd b/sys-cluster/util-vserver/files/0.30.205/vservers.confd
index a3083b80a8ab..79e46aabdc4b 100644
--- a/sys-cluster/util-vserver/files/0.30.205/vservers.confd
+++ b/sys-cluster/util-vserver/files/0.30.205/vservers.confd
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/0.30.205/vservers.confd,v 1.2 2005/06/12 09:43:54 hollow Exp $
 
 # A space-delimited list of vserver MARKS to start. 
 # Identification of vservers happens by
@@ -33,4 +33,4 @@ STOPALL=yes
 # 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
+#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
diff --git a/sys-cluster/util-vserver/files/0.30.205/vshelper-shutdown-hack b/sys-cluster/util-vserver/files/0.30.205/vshelper-shutdown-hack
new file mode 100644
index 000000000000..b23e55619b2f
--- /dev/null
+++ b/sys-cluster/util-vserver/files/0.30.205/vshelper-shutdown-hack
@@ -0,0 +1 @@
+#!/bin/true
diff --git a/sys-cluster/util-vserver/files/vservers.confd b/sys-cluster/util-vserver/files/vservers.confd
index dc00eff6a261..6be23dd1e4c4 100644
--- a/sys-cluster/util-vserver/files/vservers.confd
+++ b/sys-cluster/util-vserver/files/vservers.confd
@@ -1,6 +1,6 @@
 # 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.confd,v 1.1 2005/03/30 11:43:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.confd,v 1.2 2005/06/12 09:43:54 hollow Exp $
 
 # Should /proc automatically be unhided by vprocunhide?
 # This will be enabled if UNHIDEPROC is set regardless of its content
@@ -38,4 +38,4 @@ NUMPARALLEL=6
 # 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
+#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
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
index 1d73d1ea3cc0..14794835cd3a 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/04/08 05:18:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild,v 1.3 2005/06/12 09:43:54 hollow Exp $
 
 inherit eutils
 
@@ -62,4 +62,4 @@ pkg_postinst() {
 	einfo
 	einfo " rc-update add vprocunhide default"
 	einfo
-}
\ No newline at end of file
+}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
index 4226f24a6271..b27cd08a71d1 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
@@ -1,6 +1,6 @@
 # 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.207.ebuild,v 1.2 2005/05/17 20:41:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild,v 1.3 2005/06/12 09:43:54 hollow Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE="glibc crypt"
-DEPEND="!glibc? ( >=dev-libs/dietlibc-0.26-r1 )
+DEPEND="!glibc? ( >=dev-libs/dietlibc-0.27 )
 		glibc? ( sys-libs/glibc )
 		sys-apps/iproute2
 		net-misc/vconfig
@@ -50,6 +50,12 @@ src_install() {
 	# install conf.d files
 	insinto /etc/conf.d
 	newins ${FILESDIR}/0.30.205/vservers.confd vservers
+	
+	# Under some conditions there is a race between two vshelpers and the vps
+	# stop doesn't end. So we add a cheap workaround to bypass this until
+	# this is fixed in util-vserver itself
+	exeinto /etc/vservers/.defaults/apps/vserver-delegate
+	newexe ${FILESDIR}/0.30.205/vshelper-shutdown-hack shutdown
 
 	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
 }
@@ -63,4 +69,10 @@ pkg_postinst() {
 	einfo
 	einfo " rc-update add vprocunhide default"
 	einfo
-}
\ No newline at end of file
+
+	ewarn "You should definitly fix up the barrier of your /vserver"
+	ewarn "basedir by entering the following in a root window: "
+	ewarn
+	ewarn " setattr --barrier /vservers"
+	ewarn
+}