Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/vzctl: vzctl-9999.ebuild ChangeLog vzctl-3.0.26.2-r1.ebuild
Date: Fri, 01 Apr 2011 11:35:05
Message-Id: 20110401113455.743BB20057@flycatcher.gentoo.org
1 pva 11/04/01 11:34:55
2
3 Modified: vzctl-9999.ebuild ChangeLog
4 Added: vzctl-3.0.26.2-r1.ebuild
5 Log:
6 Added note about vzeventd. Added support for solid kernel, #361457. Enable reboot notification, fixes #361453. Thank Andreis_Vinogradovs (slepnoga) for finding all of this.
7
8 (Portage version: 2.1.9.45/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.7 sys-cluster/vzctl/vzctl-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?r1=1.6&r2=1.7
16
17 Index: vzctl-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- vzctl-9999.ebuild 22 Mar 2011 16:28:14 -0000 1.6
24 +++ vzctl-9999.ebuild 1 Apr 2011 11:34:55 -0000 1.7
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.6 2011/03/22 16:28:14 pva Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.7 2011/04/01 11:34:55 pva Exp $
30
31 EAPI="4"
32
33 @@ -19,8 +19,7 @@
34 net-firewall/iptables
35 sys-apps/ed
36 sys-apps/iproute2
37 - sys-fs/vzquota
38 - virtual/cron"
39 + sys-fs/vzquota"
40
41 DEPEND="${RDEPEND}"
42
43 @@ -77,16 +76,9 @@
44 ewarn " postup() {"
45 ewarn " /usr/sbin/vzifup-post \${IFACE}"
46 ewarn " }"
47 -
48 - elog "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
49 - elog "interfaces to send ARP requests to has been improved (see description"
50 - elog "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case CT IP addresses"
51 - elog "are not on the same subnet as HN IPs, it may lead to such CTs being"
52 - elog "unreachable from the outside world."
53 - elog
54 - elog "The solution is to set up a device route(s) for the network your CTs are"
55 - elog "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
56 - elog
57 - elog "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
58 - elog 'value other than "detect" in /etc/vz/vz.conf.'
59 + ewarn
60 + ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
61 + ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
62 + ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
63 + ewarn "/etc/init.d/vzeventd."
64 }
65
66
67
68 1.75 sys-cluster/vzctl/ChangeLog
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?rev=1.75&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?rev=1.75&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?r1=1.74&r2=1.75
73
74 Index: ChangeLog
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v
77 retrieving revision 1.74
78 retrieving revision 1.75
79 diff -u -r1.74 -r1.75
80 --- ChangeLog 22 Mar 2011 16:28:14 -0000 1.74
81 +++ ChangeLog 1 Apr 2011 11:34:55 -0000 1.75
82 @@ -1,6 +1,14 @@
83 # ChangeLog for sys-cluster/vzctl
84 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
85 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.74 2011/03/22 16:28:14 pva Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.75 2011/04/01 11:34:55 pva Exp $
87 +
88 +*vzctl-3.0.26.2-r1 (01 Apr 2011)
89 +
90 + 01 Apr 2011; Peter Volkov <pva@g.o> +vzctl-3.0.26.2-r1.ebuild,
91 + +files/vzctl-3.0.26.2-vzeventd.patch, vzctl-9999.ebuild:
92 + Added note about vzeventd. Added support for solid kernel, #361457. Enable
93 + reboot notification, fixes #361453. Thank Andreis_Vinogradovs (slepnoga) for
94 + finding all of this.
95
96 *vzctl-3.0.26.2 (22 Mar 2011)
97
98
99
100
101 1.1 sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild
102
103 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild?rev=1.1&view=markup
104 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.26.2-r1.ebuild?rev=1.1&content-type=text/plain
105
106 Index: vzctl-3.0.26.2-r1.ebuild
107 ===================================================================
108 # Copyright 1999-2011 Gentoo Foundation
109 # Distributed under the terms of the GNU General Public License v2
110 # $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 $
111
112 EAPI="4"
113
114 inherit bash-completion eutils
115
116 DESCRIPTION="OpenVZ ConTainers control utility"
117 HOMEPAGE="http://openvz.org/"
118 SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
119
120 LICENSE="GPL-2"
121 SLOT="0"
122 KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
123 IUSE="bash-completion"
124
125 RDEPEND="
126 net-firewall/iptables
127 sys-apps/ed
128 sys-apps/iproute2
129 sys-fs/vzquota"
130
131 DEPEND="${RDEPEND}"
132
133 src_prepare() {
134 # Set default OSTEMPLATE on gentoo
135 sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die
136 epatch "${FILESDIR}/vzctl-3.0.26.2-vzeventd.patch"
137 }
138
139 src_configure() {
140 econf \
141 --localstatedir=/var \
142 --enable-udev \
143 $(use_enable bash-completion bashcomp) \
144 --enable-logrotate
145 }
146
147 src_install() {
148 emake DESTDIR="${D}" install install-gentoo
149
150 # install the bash-completion script into the right location
151 rm -rf "${ED}"/etc/bash_completion.d
152 dobashcompletion etc/bash_completion.d/vzctl.sh vzctl
153
154 # We need to keep some dirs
155 keepdir /vz/{dump,lock,root,private,template/cache}
156 keepdir /etc/vz/names /var/lib/vzctl/veip
157 }
158
159 pkg_postinst() {
160 bash-completion_pkg_postinst
161 local conf_without_OSTEMPLATE
162 for file in \
163 $(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do
164 if ! grep '^OSTEMPLATE' $file > /dev/null; then
165 conf_without_OSTEMPLATE+=" $file"
166 fi
167 done
168
169 if [[ -n ${conf_without_OSTEMPLATE} ]]; then
170 ewarn
171 ewarn "OSTEMPLATE default was changed from redhat-like to gentoo."
172 ewarn "This means that any VEID.conf files without explicit or correct"
173 ewarn "OSTEMPLATE set will use gentoo scripts instead of redhat."
174 ewarn "Please check the following configs:"
175 for file in ${conf_without_OSTEMPLATE}; do
176 ewarn "${file}"
177 done
178 ewarn
179 fi
180
181 ewarn "To avoid loosing network to CTs on iface down/up, please, add the"
182 ewarn "following code to /etc/conf.d/net:"
183 ewarn " postup() {"
184 ewarn " /usr/sbin/vzifup-post \${IFACE}"
185 ewarn " }"
186 ewarn
187 ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs."
188 ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and"
189 ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use"
190 ewarn "/etc/init.d/vzeventd."
191 }