Version bump. Don't use full path in ip location to avoid bugs like #334277 from happening, thank Fabio Erculiani for report. Fixed outdated udev rule, bug 335762, thank Dennis Schridde for report.

(Portage version: 2.1.9.1/cvs/Linux x86_64)

4 files changed, 159 insertions, 1 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 4a382af56703..6279e7a699e9 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.72 2010/08/30 11:55:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.73 2010/09/10 07:46:45 pva Exp $
+
+*vzctl-3.0.24.2 (10 Sep 2010)
+
+  10 Sep 2010; Peter Volkov <pva@gentoo.org>
+  +files/0001-Don-t-prepend-full-path-for-ip-command.patch,
+  +vzctl-3.0.24.2.ebuild,
+  +files/0002-Update-udev-rules-to-match-current-specification.patch:
+  Version bump. Don't use full path in ip location to avoid bugs like
+  #334277 from happening, thank Fabio Erculiani for report. Fixed outdated
+  udev rule, bug 335762, thank Dennis Schridde for report.
 
 *vzctl-3.0.24.1-r1 (30 Aug 2010)
 
diff --git a/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch b/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch
new file mode 100644
index 000000000000..62ddac67fbc2
--- /dev/null
+++ b/sys-cluster/vzctl/files/0001-Don-t-prepend-full-path-for-ip-command.patch
@@ -0,0 +1,27 @@
+From 910a076f426d40772fcf6e0560136511f9571b41 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Mon, 30 Aug 2010 16:19:17 +0400
+Subject: [PATCH 1/2] Don't prepend full path for ip command
+
+Some distributions have ip in /sbin some in /bin. Actually it's good
+idea to drop path completely and let users to set $PATH correctly.
+---
+ scripts/vps-functions.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/scripts/vps-functions.in b/scripts/vps-functions.in
+index 0bcc65b..4a83a23 100755
+--- a/scripts/vps-functions.in
++++ b/scripts/vps-functions.in
+@@ -38,7 +38,7 @@ VE_STATE_DIR="/var/lib/vzctl/veip/"
+ CONF_DIR="@PKGCONFDIR@/conf/"
+ 
+ ARPSEND_CMD="arpsend -c 1 -w 1"
+-IP_CMD=/sbin/ip
++IP_CMD="ip"
+ 
+ # Prints error message and exits
+ # Parameters:
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch b/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch
new file mode 100644
index 000000000000..4072a1dd2a51
--- /dev/null
+++ b/sys-cluster/vzctl/files/0002-Update-udev-rules-to-match-current-specification.patch
@@ -0,0 +1,27 @@
+From e90a9bb36dc07246d49d5fe9ee693c7e22289847 Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Fri, 10 Sep 2010 11:19:32 +0400
+Subject: [PATCH 2/2] Update udev rules to match current specification
+
+Udev-151 issues following warning:
+
+udevd[569]: NAME="%k" is superfluous and breaks kernel supplied names,
+please remove it from /etc/udev/rules.d/60-vzctl.rules:1
+
+This patch fixes it.
+
+Original report: http://bugs.gentoo.org/show_bug.cgi?id=335762
+---
+ etc/udev/60-vzctl.rules |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/etc/udev/60-vzctl.rules b/etc/udev/60-vzctl.rules
+index 95cb609..e44fec5 100644
+--- a/etc/udev/60-vzctl.rules
++++ b/etc/udev/60-vzctl.rules
+@@ -1 +1 @@
+-KERNEL=="vzctl", NAME="%k", MODE="0600"
++KERNEL=="vzctl", MODE="0600"
+-- 
+1.7.2.2
+
diff --git a/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild
new file mode 100644
index 000000000000..fe43efb0106b
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.24.2.ebuild,v 1.1 2010/09/10 07:46:45 pva Exp $
+
+EAPI="2"
+
+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
+	virtual/cron"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Set default OSTEMPLATE on gentoo
+	sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
+	epatch "${FILESDIR}/0001-Don-t-prepend-full-path-for-ip-command.patch" #334277
+	epatch "${FILESDIR}/0002-Update-udev-rules-to-match-current-specification.patch" #335762
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--enable-cron \
+		--enable-udev \
+		$(use_enable bash-completion bashcomp) \
+		--enable-logrotate
+}
+
+src_install() {
+	make DESTDIR="${D}" install install-gentoo || die "make install failed"
+
+	# install the bash-completion script into the right location
+	rm -rf "${D}"/etc/bash_completion.d
+	dobashcompletion "${S}"/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 "${ROOT}/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 " }"
+
+	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.'
+}