Added note about vzeventd. Added support for solid kernel, #361457. Enable reboot notification, fixes #361453. Thank Andreis_Vinogradovs (slepnoga) for finding all of this.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

5 files changed, 189 insertions, 18 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 04b8154af326..072791fa58f9 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.74 2011/03/22 16:28:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.75 2011/04/01 11:34:55 pva Exp $
+
+*vzctl-3.0.26.2-r1 (01 Apr 2011)
+
+  01 Apr 2011; Peter Volkov <pva@gentoo.org> +vzctl-3.0.26.2-r1.ebuild,
+  +files/vzctl-3.0.26.2-vzeventd.patch, vzctl-9999.ebuild:
+  Added note about vzeventd. Added support for solid kernel, #361457. Enable
+  reboot notification, fixes #361453. Thank Andreis_Vinogradovs (slepnoga) for
+  finding all of this.
 
 *vzctl-3.0.26.2 (22 Mar 2011)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 1b9f7571f298..96db9484cc8c 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -13,12 +13,14 @@ AUX vzctl-3.0.23-ve-unlimited.conf-sample.patch 6820 RMD160 22f36eb040cc0d7c4e52
 AUX vzctl-3.0.23-vzarp-on-ifup.patch 3404 RMD160 d08123addc176a5532bfd8b264b4e5470fd49b72 SHA1 39c7254e2e0e0800e3714eaadd9c8cb26e2508c7 SHA256 ddaed5b15ad397f29643fec51b0720b0bf1ca1fcb218613c05c9d115f46b6ce7
 AUX vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch 2773 RMD160 f808e49ad253124bb1edf32ff31773eb2f3026ab SHA1 59845fa8f10fcda7f2a390205858ccb032eaaf6b SHA256 2225bcf154ca629ce9ef5d390eed19b5fbdbee4b902e203cfca9854c951a3035
 AUX vzctl-3.0.24.1-vzpostup.patch 846 RMD160 f7f844c2f4325f81e7de46f76c6ec5739ba885ff SHA1 dcd541bd9d021b02067f993001614d7d1182042b SHA256 718a00b7a02246e343f1726f8a12ad725f569ee1a9dbcd36f7d3be539a59a5c9
+AUX vzctl-3.0.26.2-vzeventd.patch 2315 RMD160 ebc24de1454ccdb6375be8562dbde0c0e233ecd0 SHA1 1b52d832b09dfc55e63e9c87324734311f6f27a6 SHA256 1f767c686841f24432ac4e75a9743b41362e096fbb01d99263e82853636c8c9e
 DIST vzctl-3.0.23.tar.bz2 361403 RMD160 6436843d4d7de8c98de3ec57c8003e3b625529ef SHA1 b94545dd5608bb48389abcb93e3fc8c91141461a SHA256 3ca7da609ee07b0a8d6b21f05c76b35ba8febc6b5c251b67c759bcbb3bf76eea
 DIST vzctl-3.0.24.2.tar.bz2 399241 RMD160 93af0cbbcdf2789f505feab21ba0c48977cbcddc SHA1 bb222e985dbe09d28c8387a861636297d6c3eb93 SHA256 378839a4d5eda102df84ddd7daa170c9b28d7df355ed57b04c5a7e19b8203ae3
 DIST vzctl-3.0.26.2.tar.bz2 405656 RMD160 e67c18ccf54b92a12cd7d3470a2fc302869c9d98 SHA1 cbdb995999f96bf2192e820dccad222a0548ee0e SHA256 6533c15c967a294bf7566a2d0c8b486519f11af22d669df518f451510256887f
 EBUILD vzctl-3.0.23-r2.ebuild 2999 RMD160 1b0a21d0bf1b815a467c5d82535d9229860614b7 SHA1 56d478571bdbde2214b80ae255c89df93ad67a43 SHA256 35b495874f09fe1757d3cc24879cb936008d7ef8e5398396c90a6db3db70e23b
 EBUILD vzctl-3.0.24.2.ebuild 2960 RMD160 563e12f3c9f25c5c25e2e4c13519ac2d17990bf1 SHA1 4dc81e76e58c5f61769cb8374c5a7f133bc5bc3d SHA256 1e2091770232b1450398aab3592b3b9585b9a0d259c8dda3a996651d700b4abe
+EBUILD vzctl-3.0.26.2-r1.ebuild 2364 RMD160 337a893972eefd3764081ab277f83c620e611ffc SHA1 68353d74226ad3da50acf332985e8d5c14f2be92 SHA256 1271a1e069d0b78e6b212cc4d64df91edec6219da1af7c218af9f9e3f16995c9
 EBUILD vzctl-3.0.26.2.ebuild 2739 RMD160 f2a1b2484b2f2faff0b125bf7c18ecc0c8cb879f SHA1 b2071ef31313f9ecaa146b18443fbf524a01741f SHA256 11ed10eff020c9d6a791b183111b2d2eea0f36a0565d3fc32c8ff91c1e09f75e
-EBUILD vzctl-9999.ebuild 2699 RMD160 bd7d4cfe31c7fadcd88cb7988f11be4aa3fdbe81 SHA1 3b3c2348540d798ad405c2f680aea0ebe8b988a0 SHA256 788aa7ecbfa1058863a922bc8babb5ab7c259908cbe13f7a046352d629bb0b73
-MISC ChangeLog 15778 RMD160 83b14d646874d98d7f9837a8ff1d4f586cd6c949 SHA1 99be2147cf37e7e362d9edfde4bb7e6ac2649318 SHA256 ce0aa0d4e66d73a556e1663e78084eee2075ffa7d18f2ec41db3ef163678f3f9
+EBUILD vzctl-9999.ebuild 2269 RMD160 77f7f409885c5cf3da2b3d35b369cf82f71568fe SHA1 8e401c8ba815e19431da0ce69896d795315aeee8 SHA256 c33562aab3f83ff7edacbe4c9bb8560f0fdfcb6a41a5261ee52ec505f1314c81
+MISC ChangeLog 16123 RMD160 106630639c4c4748e51156a791ba3ea5299f1384 SHA1 462f5a41e0eb5de0c8b501209956039897c94add SHA256 1287299a363a27b5c99d1207d388da8265340332da86e74d82d8aca57a104980
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch b/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch
new file mode 100644
index 000000000000..620c86dceb9c
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.26.2-vzeventd.patch
@@ -0,0 +1,85 @@
+From f24b1603090c6d4af163d42eff620fcfaa7c6297 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Fri, 1 Apr 2011 14:25:45 +0400
+Subject: [PATCH] vzeventd-gentoo: set reboot_event, solid kernel
+
+Allow it to work when modules are built in (MODULES_DISABLED=yes).
+Set /sys/module/vzevent/parameters/reboot_event=1 on service startup.
+Small clenups.
+
+Fixes Gentoo bugs:
+http://bugs.gentoo.org/show_bug.cgi?id=361453
+http://bugs.gentoo.org/show_bug.cgi?id=361457
+---
+ etc/init.d/vzeventd-gentoo.in |   40 ++++++++++++++++++++++++++++------------
+ 1 files changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/etc/init.d/vzeventd-gentoo.in b/etc/init.d/vzeventd-gentoo.in
+index e8fe64e..2c0da26 100644
+--- a/etc/init.d/vzeventd-gentoo.in
++++ b/etc/init.d/vzeventd-gentoo.in
+@@ -6,25 +6,41 @@ depend() {
+ }
+ 
+ check_config() {
+-# if we don't want openvz running, say so
++	source /etc/conf.d/vz
++	# if we don't want openvz running, say so
+ 	[ "${VIRTUOZZO}" = "yes" ] || return 1
+ 	: ${VZEVENTD:=@SBINDIR@/vzeventd}
+ }
+ 
++load_module() {
++	if [ "${MODULES_DISABLED}" != "yes" ]; then
++		local rv=0
++		ebegin "Loading vzevent module"
++		modprobe -r vzevent >/dev/null 2>&1
++		modprobe vzevent reboot_event=1 >/dev/null 2>&1
++		rv=$?
++		if [ ${rv} -ne 0 ]; then
++			eend ${rv}
++			return ${rv}
++		fi
++	fi
++
++	local param=/sys/module/vzevent/parameters/reboot_event
++	if ! grep -Fqw 1 "${param}"; then
++		ewarn "vzevent module should be loaded with reboot_event=1 parameter"
++		ewarn "setting reboot_event to 1..."
++		ewarn "echo 1 > ${param}"
++		echo 1 > "${param}"
++	fi
++	return 0
++}
++
+ start() {
+ 	check_config || return
+-	ebegin "Loading vzevent module"
+-	modprobe -r vzevent >/dev/null 2>&1
+-	modprobe vzevent reboot_event=1 >/dev/null 2>&1
+-	rc=$?
+-	if [ ${rc} -ne 0 ]; then
+-		eend ${rc} "failed"
+-		return ${rc}
+-	fi
+-	eend ${rc}
++	load_module || return
+ 
+ 	ebegin "Starting vzeventd"
+-	start-stop-daemon --start --exec $VZEVENTD \
++	start-stop-daemon --start --exec ${VZEVENTD} \
+ 		--pidfile /var/run/vzeventd.pid \
+ 		-- ${VZEVENTD_OPTS}
+ 	eend $?
+@@ -33,7 +49,7 @@ start() {
+ stop() {
+ 	check_config || return
+ 	ebegin "Stopping vzeventd"
+-		start-stop-daemon --stop --exec $VZEVENTD \
++	start-stop-daemon --stop --exec ${VZEVENTD} \
+ 		--pidfile /var/run/vzeventd.pid
+ 	eend $?
+ }
+-- 
+1.7.3.4
+
diff --git a/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
new file mode 100644
index 000000000000..723f495000f3
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild,v 1.1 2011/04/01 11:34:55 pva Exp $
+
+EAPI="4"
+
+inherit bash-completion eutils
+
+DESCRIPTION="OpenVZ ConTainers 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 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="bash-completion"
+
+RDEPEND="
+	net-firewall/iptables
+	sys-apps/ed
+	sys-apps/iproute2
+	sys-fs/vzquota"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Set default OSTEMPLATE on gentoo
+	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
+	epatch "${FILESDIR}/vzctl-3.0.26.2-vzeventd.patch"
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--enable-udev \
+		$(use_enable bash-completion bashcomp) \
+		--enable-logrotate
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-gentoo
+
+	# install the bash-completion script into the right location
+	rm -rf "${ED}"/etc/bash_completion.d
+	dobashcompletion etc/bash_completion.d/vzctl.sh vzctl
+
+	# We need to keep some dirs
+	keepdir /vz/{dump,lock,root,private,template/cache}
+	keepdir /etc/vz/names /var/lib/vzctl/veip
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+	local conf_without_OSTEMPLATE
+	for file in \
+		$(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
+		if ! grep '^OSTEMPLATE' $file > /dev/null; then
+			conf_without_OSTEMPLATE+=" $file"
+		fi
+	done
+
+	if [[ -n ${conf_without_OSTEMPLATE} ]]; then
+		ewarn
+		ewarn "OSTEMPLATE default was changed from redhat-like to gentoo."
+		ewarn "This means that any VEID.conf files without explicit or correct"
+		ewarn "OSTEMPLATE set will use gentoo scripts instead of redhat."
+		ewarn "Please check the following configs:"
+		for file in ${conf_without_OSTEMPLATE}; do
+			ewarn "${file}"
+		done
+		ewarn
+	fi
+
+	ewarn "To avoid loosing network to CTs on iface down/up, please, add the"
+	ewarn "following code to /etc/conf.d/net:"
+	ewarn " postup() {"
+	ewarn "     /usr/sbin/vzifup-post \${IFACE}"
+	ewarn " }"
+	ewarn
+	ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
+	ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
+	ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
+	ewarn "/etc/init.d/vzeventd."
+}
diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild
index 878f72541c08..d6164a8fc425 100644
--- a/sys-cluster/vzctl/vzctl-9999.ebuild
+++ b/sys-cluster/vzctl/vzctl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.6 2011/03/22 16:28:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.7 2011/04/01 11:34:55 pva Exp $
 
 EAPI="4"
 
@@ -19,8 +19,7 @@ RDEPEND="
 	net-firewall/iptables
 	sys-apps/ed
 	sys-apps/iproute2
-	sys-fs/vzquota
-	virtual/cron"
+	sys-fs/vzquota"
 
 DEPEND="${RDEPEND}"
 
@@ -77,16 +76,9 @@ pkg_postinst() {
 	ewarn " postup() {"
 	ewarn "     /usr/sbin/vzifup-post \${IFACE}"
 	ewarn " }"
-
-	elog "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
-	elog "interfaces to send ARP requests to has been improved (see description"
-	elog "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case CT IP addresses"
-	elog "are not on the same subnet as HN IPs, it may lead to such CTs being"
-	elog "unreachable from the outside world."
-	elog
-	elog "The solution is to set up a device route(s) for the network your CTs are"
-	elog "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
-	elog
-	elog "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
-	elog 'value other than "detect" in /etc/vz/vz.conf.'
+	ewarn
+	ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
+	ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
+	ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
+	ewarn "/etc/init.d/vzeventd."
 }