Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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