Revision bump, fixing vzctl-3.0.10-Makefile.patch. Now also installs vpsnetclean and vpsreboot scripts into /usr/share/vzctl/scripts. Including initscript changes from Kir Kolyshkin <kir@openvz.org>.

Package-Manager: portage-2.1.1_pre1-r5

7 files changed, 351 insertions, 20 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index f3c84385e283..c8e96aba3d3e 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.26 2006/06/22 04:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.27 2006/06/28 14:39:09 phreak Exp $
+
+*vzctl-3.0.10-r1 (28 Jun 2006)
+
+  28 Jun 2006; Christian Heim <phreak@gentoo.org>
+  files/vzctl-3.0.10-Makefile.patch, +files/vz-3.0.10.initd,
+  vzctl-3.0.10.ebuild, +vzctl-3.0.10-r1.ebuild:
+  Revision bump, fixing vzctl-3.0.10-Makefile.patch. Now also installs
+  vpsnetclean and vpsreboot scripts into /usr/share/vzctl/scripts. Including
+  initscript changes from Kir Kolyshkin <kir@openvz.org>
 
   22 Jun 2006; Benedikt Böhm <hollow@gentoo.org> vzctl-3.0.10.ebuild:
   fix libdir; add warning
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 670dd645ff74..74d418ecde11 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vz-3.0.10.initd 5738 RMD160 8989d4b9969039c0f259309e133ac041360ba169 SHA1 c0e2e0023aa81b1a0d3060e54cc5a1dd60e00fd6 SHA256 389a83c1f7e6c9a5962e29862e4170a5a577aac796ab1f83fa46e7b05c5b75e9
+MD5 40be82d78c00768ad842ff38a835eb35 files/vz-3.0.10.initd 5738
+RMD160 8989d4b9969039c0f259309e133ac041360ba169 files/vz-3.0.10.initd 5738
+SHA256 389a83c1f7e6c9a5962e29862e4170a5a577aac796ab1f83fa46e7b05c5b75e9 files/vz-3.0.10.initd 5738
 AUX vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 SHA1 967cc1a9d71109db574f565d2f733332cfafcf50 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0
 MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 files/vz.initd 5465
 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0 files/vz.initd 5465
-AUX vzctl-3.0.10-Makefile.patch 2096 RMD160 5e4e4158836ac306d7daac8ddc6d320a80db4fbd SHA1 77eb07bd8203ec825d013d27fa9aa89bf21e08c6 SHA256 df3725a01b93e2e099e4484f306867322c3e38123adc49b2e1394a45c02dc9eb
-MD5 3d5da7ef37f9e9fdd596402817d8b382 files/vzctl-3.0.10-Makefile.patch 2096
-RMD160 5e4e4158836ac306d7daac8ddc6d320a80db4fbd files/vzctl-3.0.10-Makefile.patch 2096
-SHA256 df3725a01b93e2e099e4484f306867322c3e38123adc49b2e1394a45c02dc9eb files/vzctl-3.0.10-Makefile.patch 2096
+AUX vzctl-3.0.10-Makefile.patch 2109 RMD160 02650e496e114734961012246753d948f5dccc3c SHA1 f1409eceaa4b119572b417e980caae8ee29edc86 SHA256 564fda20c9f54a70150a53a7a32d42de0c638262d55c2bdd75ec6378ef6aaf1c
+MD5 f2df784d2dfd20f96eb69177204c3dfa files/vzctl-3.0.10-Makefile.patch 2109
+RMD160 02650e496e114734961012246753d948f5dccc3c files/vzctl-3.0.10-Makefile.patch 2109
+SHA256 564fda20c9f54a70150a53a7a32d42de0c638262d55c2bdd75ec6378ef6aaf1c files/vzctl-3.0.10-Makefile.patch 2109
 AUX vzctl-3.0.10-as-needed.patch 2873 RMD160 fd68de2965e760119ff733228bed686f3ecc002c SHA1 a5d9a14d12865cd788fddb79b4d67fb2888baecd SHA256 7eebb62833d9987d1df650fe3dca86e9bfa26e006b59f15ec29497d4177ff198
 MD5 0414e832d240f2f381486930011960a7 files/vzctl-3.0.10-as-needed.patch 2873
 RMD160 fd68de2965e760119ff733228bed686f3ecc002c files/vzctl-3.0.10-as-needed.patch 2873
@@ -32,14 +36,18 @@ EBUILD vzctl-3.0.0.8.ebuild 1722 RMD160 b8dcb0398d5eea198ec644d3df4e51eb68394bf9
 MD5 c95923e684f3f56566d1557f5098840c vzctl-3.0.0.8.ebuild 1722
 RMD160 b8dcb0398d5eea198ec644d3df4e51eb68394bf9 vzctl-3.0.0.8.ebuild 1722
 SHA256 b2d5707ee42ed25a5ce219ea9e364ce1df2ba5661e8072063fdaa423507e4e06 vzctl-3.0.0.8.ebuild 1722
-EBUILD vzctl-3.0.10.ebuild 1263 RMD160 121d416fe1666c16344eebaa2d648888f9d7c303 SHA1 ee28945a6fa64e6eb5bdf1854ec732cb29eb217b SHA256 63674f0337ec5474d943d208338eb5bb5ce459ba8d039261630a8a4036993bb7
-MD5 bda3a2ca4377fc99fe08f1f4e379b103 vzctl-3.0.10.ebuild 1263
-RMD160 121d416fe1666c16344eebaa2d648888f9d7c303 vzctl-3.0.10.ebuild 1263
-SHA256 63674f0337ec5474d943d208338eb5bb5ce459ba8d039261630a8a4036993bb7 vzctl-3.0.10.ebuild 1263
-MISC ChangeLog 4737 RMD160 8c9864c6d6f9e78d197feb0262212cde56f15e2b SHA1 60d95dac97de362e58c56e6f6c50c8bf2d27fa59 SHA256 8ad7c6098262d030fb4817480ce9d90e443d6acb9af098b69de0fe023a244632
-MD5 22cba0cc7f7b460078f4c06a20e1a819 ChangeLog 4737
-RMD160 8c9864c6d6f9e78d197feb0262212cde56f15e2b ChangeLog 4737
-SHA256 8ad7c6098262d030fb4817480ce9d90e443d6acb9af098b69de0fe023a244632 ChangeLog 4737
+EBUILD vzctl-3.0.10-r1.ebuild 1272 RMD160 acc6e40952af49b137c7ff5c4a303fb3978dbc19 SHA1 a9e258bac62e03fc310622d080c9709619c6607b SHA256 478c9cf40bde786105c99cf86cf92a7b5d50a15ffcff2c7ce47bdac38623ca35
+MD5 b45c5a8ffc64672885175aadc3a7583a vzctl-3.0.10-r1.ebuild 1272
+RMD160 acc6e40952af49b137c7ff5c4a303fb3978dbc19 vzctl-3.0.10-r1.ebuild 1272
+SHA256 478c9cf40bde786105c99cf86cf92a7b5d50a15ffcff2c7ce47bdac38623ca35 vzctl-3.0.10-r1.ebuild 1272
+EBUILD vzctl-3.0.10.ebuild 1269 RMD160 a01326de91e0735dd03ed1f5606fc2cc84f2f6a7 SHA1 673e202eb69cea28fd7e98029e5032e8052f7265 SHA256 447d0d4ea470829b2799baafff02e8324ce20b7f46cc73cf73c43d6cdd3c8d9f
+MD5 4145452d96185888138c2c78eea41c4d vzctl-3.0.10.ebuild 1269
+RMD160 a01326de91e0735dd03ed1f5606fc2cc84f2f6a7 vzctl-3.0.10.ebuild 1269
+SHA256 447d0d4ea470829b2799baafff02e8324ce20b7f46cc73cf73c43d6cdd3c8d9f vzctl-3.0.10.ebuild 1269
+MISC ChangeLog 5134 RMD160 efb4f18e676390960a6a423420b86ca4b53618bf SHA1 23ea138ef074574d99e0c3d37f13d02836592f98 SHA256 7ee56b0397d947d3fab31773cb29356fc1c51972d0d5cdc52cc840d7c8d91b79
+MD5 0634a05f6b6f6e707affdc1ed883f484 ChangeLog 5134
+RMD160 efb4f18e676390960a6a423420b86ca4b53618bf ChangeLog 5134
+SHA256 7ee56b0397d947d3fab31773cb29356fc1c51972d0d5cdc52cc840d7c8d91b79 ChangeLog 5134
 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
@@ -56,10 +64,13 @@ SHA256 dc1dba3fb70c9a7212de8916eaaeb3c2b4a6b847702d90e0c58d06c62e9b3dc2 files/di
 MD5 7365696cd7a02b0e95dcb8f2fd2dc4f6 files/digest-vzctl-3.0.10 241
 RMD160 a261afbc8cb201122078369798a48a35c9683419 files/digest-vzctl-3.0.10 241
 SHA256 f8a7e2630d02bb442a709d0486c7028b1b75b93d53ea747661a1e6b93095c8d7 files/digest-vzctl-3.0.10 241
+MD5 7365696cd7a02b0e95dcb8f2fd2dc4f6 files/digest-vzctl-3.0.10-r1 241
+RMD160 a261afbc8cb201122078369798a48a35c9683419 files/digest-vzctl-3.0.10-r1 241
+SHA256 f8a7e2630d02bb442a709d0486c7028b1b75b93d53ea747661a1e6b93095c8d7 files/digest-vzctl-3.0.10-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEmhyGmPFBzbX68WERAq7fAJ0Yy38wMWOyaIcH/Ay4vFkMdJXRVACeLGOc
-MuMM+jXyy1nKQ8Ac1NMtf3I=
-=Xuyc
+iD8DBQFEopSZflZ8QqxhrsMRAv5SAKCa5fRZySEcIk0ufw7b0ZK4giZizACgrmq+
+n61HmpBy+p6JOF7uSm/46+c=
+=84Tg
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r1 b/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r1
new file mode 100644
index 000000000000..d1e71e8f4e47
--- /dev/null
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.10-r1
@@ -0,0 +1,3 @@
+MD5 790dc15a779764a453b11c2368bccc40 vzctl-3.0.10.tar.bz2 124070
+RMD160 e3a1ae0846a5b7b8a054fb416c20eb7ae57d0008 vzctl-3.0.10.tar.bz2 124070
+SHA256 5509857493533cf68b55a2183154aac12d23ab65d555db3b4328c0619ca8080f vzctl-3.0.10.tar.bz2 124070
diff --git a/sys-cluster/vzctl/files/vz-3.0.10.initd b/sys-cluster/vzctl/files/vz-3.0.10.initd
new file mode 100644
index 000000000000..7ba0eaa5cffc
--- /dev/null
+++ b/sys-cluster/vzctl/files/vz-3.0.10.initd
@@ -0,0 +1,258 @@
+#!/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/vzctl/files/vz-3.0.10.initd,v 1.1 2006/06/28 14:39:09 phreak Exp $
+
+depend() {
+	need net
+	before iptables
+}
+
+check_config() {
+	# if we don't want openvz running, say so
+	[ "${VIRTUOZZO}" = "yes" ] || return 1
+	
+	# set default values
+	: ${VZCTL:=/usr/sbin/vzctl}
+	: ${VZQUOTA:=/usr/sbin/vzquota}
+	: ${VZVEINFO:=/proc/vz/veinfo}
+	: ${VPSCONFDIR:=/etc/vz}
+	: ${PRELOAD_MODULES:="af_packet"}
+	: ${MODULES:="vzmon vzdquota vzdev"}
+	: ${NET_MODULES="vznetdev vznet"}
+	: ${VZDEV:=venet0}
+	: ${PARALLEL:=4}
+	
+	# check if you should load vzwdog module
+	[ "${VZWDOG}" = "yes" ] && MODULES="${MODULES} vzwdog"
+	
+	# we need a working vzctl
+	if [ ! -x "${VZCTL}" ]; then
+		eerror "vzctl missing (${VZCTL})"
+		return 1
+	fi
+	
+	# prevent dumb users from failure
+	if [ ! -e /dev/vzctl ]; then
+		eerror "Missing device node /dev/vzctl"
+		einfo
+		einfo "Please create the vzctl device node using the following command:"
+		einfo "   /bin/mknod /dev/vzctl c 126 0"
+		einfo
+		return 1
+	fi
+	
+	if [ -z "${VE0CPUUNITS}" ]; then
+		ewarn "VE0CPUUNITS is not set in /etc/conf.d/vz; using default value of 1000"
+		VE0CPUUNITS=1000
+	fi
+	return 0
+}
+
+setup_ve0() {
+	local msg ve0conf="${VPSCONFDIR}/0.conf"
+
+	msg=$(${VZCTL} set 0 --cpuunits ${VE0CPUUNITS} 2>&1)
+	[ $? -ne 0 ] && ewarn "vzctl set 0 --cpuunits ${VE0CPUUNITS} failed: ${msg}"
+
+	test -f ${ve0conf} || return
+	egrep -q '^ONBOOT=yes\|^ONBOOT=\"yes\"' ${ve0conf} || return
+
+	ebegin "Configuring hardware node UB resources: "
+	msg=$(${VZCTL} set 0 --reset_ub 2>&1)
+	eend $? ${msg}
+}
+
+start_net() {
+	local mod
+	
+	# we don't operate on a running interface
+	if /sbin/ip addr ls | grep -q "venet0:.*UP" 2>/dev/null; then
+		return 0
+	fi
+	
+	# load necessary modules
+	for mod in ${NET_MODULES}; do
+		/sbin/modprobe ${mod} 2>/dev/null
+	done
+	
+	# configure the device
+	ebegin "Bringing up interface ${VZDEV}"
+		/sbin/ip link set ${VZDEV} up
+	eend $?
+	
+	/sbin/ip addr add 0.0.0.0/0 dev ${VZDEV}
+	
+	ebegin "Configuring interface ${VZDEV}"
+		/sbin/sysctl -q -w net.ipv4.conf.${VZDEV}.send_redirects=0
+	eend $?
+}
+
+stop_net() {
+	local mod
+
+	if /sbin/ip a l | grep -q "venet0:.*UP" 2>/dev/null; then
+		ebegin "Bringing down interface ${VZDEV}"
+			/sbin/ip link set ${VZDEV} down 2>/dev/null
+		eend $?
+	fi
+	
+	# remove all modules we probably loaded on start_net
+	for mod in ${NET_MODULES}; do
+		/sbin/modprobe -r ${mod} > /dev/null 2>&1
+	done
+}
+
+start_ve() {
+	local veid velist msg need_restart=""
+	
+	# get all VPSs we should start on boot
+	if ! cd ${VPSCONFDIR}; then
+		eerror $? "Unable to cd to ${VPSCONFDIR}"
+		return 1
+	fi
+	velist=$(grep -l '^ONBOOT=yes\|^ONBOOT=\"yes\"' [0-9]*.conf 2>/dev/null | sed -e 's/.conf//g' | sort -n)
+	cd - >/dev/null
+	
+	/sbin/sysctl -q -w net.ipv4.route.src_check=0
+	
+	for veid in ${velist}; do
+		ebegin "Starting VPS ${veid}"
+		if [ "${VZFASTBOOT}" = "yes" -a "${DISK_QUOTA}" = "yes" ]; then
+			${VZQUOTA} stat ${veid} >/dev/null 2>&1
+			if [ $? -eq 6 ]; then
+				if ${VZQUOTA} show ${veid} 2>&1 | grep "vzquota : (warning) Quota is running" >/dev/null 2>&1; then
+					${VZQUOTA} on ${veid} --nocheck >/dev/null 2>&1
+					need_restart="${need_restart} ${veid}"
+				fi
+			fi
+		fi
+		msg=$(${VZCTL} start ${veid} 2>&1)
+		eend $? "${msg}"
+	done
+	
+	for veid in ${need_restart}; do
+		ebegin "Stopping VPS ${veid}"
+		msg=$(${VZCTL} stop ${veid})
+		eend $? "${msg}"
+		
+		ebegin "Starting VPS ${veid}"
+		msg=$($VZCTL start ${veid} 2>&1)
+		eend $? "${msg}"
+	done
+	
+	# we're ok even if some VPSs failed to start
+	return 0
+}
+
+stop_ve() {
+	local veid velist msg m mounts fail i iter pid pids quota
+
+	if [ -f ${VZVEINFO} ]; then
+		for ((i = 0; i <= 2; i++)); do
+			iter=0
+			pids=
+			velist=$(awk  '{print $1;}' < ${VZVEINFO} | grep -v "^0$")
+			
+			for veid in ${velist}; do
+				ebegin "Shutting down VPS $veid"
+				# Set fairsched parameters to maximum so
+				# VPS will stop fast
+				${VZCTL} set ${veid} --cpuunits 2000 --cpulimit 0 >/dev/null 2>&1
+				${VZCTL} --skiplock stop ${veid} >/dev/null 2>&1 &
+				pids="${pids} $!"
+				let iter++
+				sleep 1
+				if [ ${iter} -gt ${PARALLEL} ]; then
+					for pid in ${pids}; do
+						wait ${pid}
+					done
+					pids=
+					iter=0
+				fi
+			done
+			
+			for pid in ${pids}; do
+				wait ${pid}
+			done
+		done
+	fi
+	
+	iter=0
+	fail=1
+	
+	while [ ${iter} -lt 5 -a ${fail} -ne 0 ]; do
+		fail=0
+		mounts=$(awk '{if ($3=="simfs") print $2}' /proc/mounts)
+		
+		for m in ${mounts}; do
+			ebegin "Unmounting VPS area ${m}"
+			msg=$(umount ${m} 2>&1)
+			eend $? "${msg}"
+			if [ $? -ne 0 ]; then
+				let fail++
+				fuser -k -m ${m} > /dev/null 2>&1
+			fi
+		done
+		
+		let iter++
+	done
+	
+	# turn quota off
+	quota=$(awk -F: '/^[0-9]+:/{print $1}' /proc/vz/vzquota 2>/dev/null)
+	
+	for m in ${quota}; do
+		ebegin "Turning quota off for VPS ${m}"
+		msg=$(vzquota off ${m} 2>&1)
+		eend $? "${msg}"
+	done
+}
+
+start() {
+	check_config || return
+	
+	local mod rc
+	
+	ebegin "Loading OpenVZ modules"
+	for mod in ${PRELOAD_MODULES}; do
+		/sbin/modprobe -r ${mod} >/dev/null 2>&1
+		/sbin/modprobe ${mod} >/dev/null 2>&1
+	done
+	
+	for mod in ${MODULES}; do
+		/sbin/modprobe ${mod} >/dev/null 2>&1
+		rc=$?
+		if [ ${rc} -ne 0 ]; then
+			eend ${rc} "failed to load module ${mod}"
+			return ${rc}
+		fi
+	done
+	eend
+	
+	start_net
+
+	setup_ve0
+	
+	start_ve
+}
+
+stop() {
+	check_config || return
+	
+	local mod
+	
+	stop_ve
+	stop_net
+	
+	for mod in ${MODULES}; do
+		/sbin/modprobe -r ${mod} > /dev/null 2>&1
+	done
+	
+	for mod in ${PRELOAD_MODULES}; do
+		/sbin/modprobe -r ${mod} > /dev/null 2>&1
+	done
+	
+	# Even if some modules failed to unload (say they were not loaded)
+	# we return 0 for the service to be marked as stopped.
+	return 0
+}
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch
index 2e85cb0143da..68bef8cd1dd8 100644
--- a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch
+++ b/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch
@@ -53,7 +53,7 @@ Index: vzctl-3.0.10/src/Makefile
  
 -install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \
 -	inst-netscripts inst-configs inst-initd inst-cron 
-+install: $(PROGS) inst-dirs install-lib inst-sbin inst-configs inst-cron
++install: $(PROGS) inst-dirs install-lib inst-sbin inst-configs inst-cron inst-scripts
  clean:
  	rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend
  
diff --git a/sys-cluster/vzctl/vzctl-3.0.10-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..e7a032161b69
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.10-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.10-r1.ebuild,v 1.1 2006/06/28 14:39:09 phreak Exp $
+
+inherit eutils
+
+DESCRIPTION="OpenVZ VPS control utility"
+HOMEPAGE="http://openvz.org/"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/logrotate
+	sys-apps/ed
+	net-firewall/iptables
+	sys-fs/vzquota
+	sys-apps/iproute2"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
+
+	# Install gentoo specific init script
+	newinitd "${FILESDIR}"/vz-${PV}.initd vz
+}
+
+pkg_postinst() {
+	if has_version "<3.0.10"; then
+		ewarn
+		ewarn "The location of some vzctl files have changed. Most notably,"
+		ewarn "VE configuration files and samples directory has changed from"
+		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
+		ewarn "your VEs, please do the following:"
+		ewarn
+		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
+		ewarn
+	fi
+}
diff --git a/sys-cluster/vzctl/vzctl-3.0.10.ebuild b/sys-cluster/vzctl/vzctl-3.0.10.ebuild
index c1bf540dccbb..f46cfa98cc57 100644
--- a/sys-cluster/vzctl/vzctl-3.0.10.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.10.ebuild,v 1.2 2006/06/22 04:28:44 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.10.ebuild,v 1.3 2006/06/28 14:39:09 phreak Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ src_install() {
 	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
 
 	# Install gentoo specific init script
-	newinitd "${FILESDIR}"/vz.initd vz
+	newinitd "${FILESDIR}"/vz-${PV}.initd vz
 }
 
 pkg_postinst() {