Fixed vzeventd failure to stop, bug #382213 thank Vladimir Berezhnoy for report.

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

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 639209ee4df990a46f1aeb7d797509a36d8b5a0f..175a91ffcb09efa4317807d24134421b8a8fa593 100644 (file)
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.82 2011/08/13 13:32:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.83 2011/09/11 13:10:30 pva Exp $
+
+*vzctl-3.0.28.3-r1 (11 Sep 2011)
+
+  11 Sep 2011; Peter Volkov <pva@gentoo.org> +vzctl-3.0.28.3-r1.ebuild,
+  +files/vzctl-3.0.28.3-vzeventd-stop.patch:
+  Fixed vzeventd failure to stop, bug #382213 thank Vladimir Berezhnoy for
+  report.
 
   13 Aug 2011; Peter Volkov <pva@gentoo.org> -vzctl-3.0.26.3.ebuild,
   -vzctl-3.0.27.ebuild, -vzctl-3.0.28.2.ebuild, vzctl-3.0.28.3.ebuild:

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 4ee3ea3c69c8bca27593d89329f27ddda18e9c88..2b6a33f39015c0fb218da94a8681b290626af3a5 100644 (file)
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,8 +1,10 @@
 AUX vzctl-3.0.26.2-vzeventd.patch 2315 RMD160 ebc24de1454ccdb6375be8562dbde0c0e233ecd0 SHA1 1b52d832b09dfc55e63e9c87324734311f6f27a6 SHA256 1f767c686841f24432ac4e75a9743b41362e096fbb01d99263e82853636c8c9e
+AUX vzctl-3.0.28.3-vzeventd-stop.patch 1068 RMD160 c482d4d4770687e9c7d5d13c406518a5a4bf1cbf SHA1 37e04da90df8d78d903e673dbc916f7a7047eab8 SHA256 65a0b15ac4b0f1da3005207e3e15ef9bdd2adae714fb0f6d26eb9498b817b9c5
 DIST vzctl-3.0.26.2.tar.bz2 405656 RMD160 e67c18ccf54b92a12cd7d3470a2fc302869c9d98 SHA1 cbdb995999f96bf2192e820dccad222a0548ee0e SHA256 6533c15c967a294bf7566a2d0c8b486519f11af22d669df518f451510256887f
 DIST vzctl-3.0.28.3.tar.bz2 414418 RMD160 518247189a01a178d4783a3a95e0b69e187f7ceb SHA1 18113c3f9910985893fa8eceaade16fec093fc85 SHA256 926b88de4e2c065f3389751dc183f1653eff470a0d0cae4401697fc8aae8a30e
 EBUILD vzctl-3.0.26.2-r1.ebuild 2362 RMD160 d5e81238399feb92bfde03980514adcab332b3ea SHA1 5ed058d01b16a24ce8dff3f4240a9bf0d1128636 SHA256 57e87865e0dbad8fd7dfe0b68eb77693327478f6665a1036b627575f81383e11
+EBUILD vzctl-3.0.28.3-r1.ebuild 2285 RMD160 2c23d86657b3c32c345dbaf08d33dd322813713d SHA1 273a4cea2a031347bcadf1cf4e073d8551236f61 SHA256 7a0b17cff31deda5c23ea8a1c463bcf078c1b2923e2f99d3c3eac3eb225b420f
 EBUILD vzctl-3.0.28.3.ebuild 2301 RMD160 6daad9a84cfa463cab2c0e8f2cda4906ecdfd95b SHA1 f1b12cacfea27d70344c6aa5753cff4f258dc9e0 SHA256 4ceedd88ea28f26f2dee4291e098886663d39bc08e31949e5a4b50d2f6fad232
 EBUILD vzctl-9999.ebuild 2269 RMD160 77f7f409885c5cf3da2b3d35b369cf82f71568fe SHA1 8e401c8ba815e19431da0ce69896d795315aeee8 SHA256 c33562aab3f83ff7edacbe4c9bb8560f0fdfcb6a41a5261ee52ec505f1314c81
-MISC ChangeLog 17908 RMD160 bd11914fbec44f0af9c2b1ef0a677ba40be5c2ec SHA1 59788c0fb69f2c40b7678fa9d76c54d5aaf1e151 SHA256 5c6e8f709a4beb5a7be0c25134f06b819ed64332ffe318b31b65cd49902cd16f
+MISC ChangeLog 18145 RMD160 7805ef297ed1185273aee2978fc42b661c41bcde SHA1 360056aa4e7e6b9fcb65ffec9ef4d7add5669cbc SHA256 35636633e75416e98c78384d9354502b57cf7e7b9ee41ae2ffc84302ae334824
 MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215

diff --git a/sys-cluster/vzctl/files/vzctl-3.0.28.3-vzeventd-stop.patch b/sys-cluster/vzctl/files/vzctl-3.0.28.3-vzeventd-stop.patch
new file mode 100644 (file)
index 0000000..960afa2
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.28.3-vzeventd-stop.patch
@@ -0,0 +1,37 @@
+From cf5b82e9758a96f493469caade1b447552415c5a Mon Sep 17 00:00:00 2001
+From: Peter Volkov <pva@gentoo.org>
+Date: Sun, 11 Sep 2011 15:47:22 +0400
+Subject: [PATCH] etc/init.d/vzeventd-gentoo.in: fix service stop
+
+vzeventd does not create pid file. Drop its mentioning from init script
+to fix /etc/init.d/vzeventd stop.
+
+https://bugs.gentoo.org/show_bug.cgi?id=382213
+---
+ etc/init.d/vzeventd-gentoo.in |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/etc/init.d/vzeventd-gentoo.in b/etc/init.d/vzeventd-gentoo.in
+index 2c0da26..d7abcdf 100644
+--- a/etc/init.d/vzeventd-gentoo.in
++++ b/etc/init.d/vzeventd-gentoo.in
+@@ -41,7 +41,6 @@ start() {
+ 
+       ebegin "Starting vzeventd"
+       start-stop-daemon --start --exec ${VZEVENTD} \
+-              --pidfile /var/run/vzeventd.pid \
+               -- ${VZEVENTD_OPTS}
+       eend $?
+ }
+@@ -49,7 +48,6 @@ start() {
+ stop() {
+       check_config || return
+       ebegin "Stopping vzeventd"
+-      start-stop-daemon --stop --exec ${VZEVENTD} \
+-              --pidfile /var/run/vzeventd.pid
++      start-stop-daemon --stop --exec ${VZEVENTD}
+       eend $?
+ }
+-- 
+1.7.3.4
+

diff --git a/sys-cluster/vzctl/vzctl-3.0.28.3-r1.ebuild b/sys-cluster/vzctl/vzctl-3.0.28.3-r1.ebuild
new file mode 100644 (file)
index 0000000..cde931c
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.28.3-r1.ebuild
@@ -0,0 +1,83 @@
+# 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.28.3-r1.ebuild,v 1.1 2011/09/11 13:10:30 pva Exp $
+
+EAPI="4"
+
+inherit bash-completion-r1 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=""
+
+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}/${P}-vzeventd-stop.patch"
+}
+
+src_configure() {
+       econf \
+               --localstatedir=/var \
+               --enable-udev \
+               --enable-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
+       newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
+
+       # We need to keep some dirs
+       keepdir /vz/{dump,lock,root,private,template/cache}
+       keepdir /etc/vz/names /var/lib/vzctl/veip
+}
+
+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 "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."
+}