Updating the ebuild. Excluding the tools/ folder, its no longer needed. Also warning about the behaviour change introduced by the seperate init-scripts.

svn path=/; revision=84

1 files changed, 9 insertions, 11 deletions

diff --git a/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild
index 10e7e10..4abe9c9 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild
@@ -58,7 +58,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
 	epatch "${WORKDIR}"/patches/*.patch
 
 	eautomake
@@ -92,7 +91,7 @@ src_install() {
 	rm -f "${D}"/etc/init.d/*
 
 	# and install branded/customized init-scripts:
-	doinitd "${WORKDIR}"/init.d/vservers || die "Failed to ins init.d/vservers"
+	doinitd "${WORKDIR}"/init.d/v* || die "Failed to ins init.d/v*"
 	doconfd "${WORKDIR}"/conf.d/vservers || die "Failed to ins conf.d/vservers"
 
 	# bash-completion
@@ -108,25 +107,24 @@ pkg_postinst() {
 	einfo "use. An init script has been installed by this package."
 	einfo "To use it you should add it to a runlevel:"
 	einfo
-	einfo " rc-update add vservers default"
+	einfo " rc-update add vprocunhide default"
 	einfo
-	einfo "This init script will also help you to start/stop your vservers"
-	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
 	ewarn
 	ewarn "You should definitly fix up the barrier of your vserver"
 	ewarn "base directory by using the following command in a root shell:"
 	ewarn
 	ewarn " setattr --barrier ${VDIRBASE}"
 	ewarn
-	if has_version "<0.30.208-r8" ; then
+	if has_version "<0.30.211-r1" ; then
 		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 "Since 0.30.211-r1 the vservers init-script has been split"
+		ewarn "into vprocunhide and vserver.defaults. The following steps"
+		ewarn "are required to keep current behaviour:"
 		ewarn
-		ewarn " rc-update del vprocunhide"
-		ewarn " rc-update add vservers default"
+		ewarn " rc-update del vservers"
+		ewarn " rc-update add vprocunhide default"
+		ewarn " rc-update add vservers.default default"
 		ewarn
 	fi
 }