1 |
pva 12/03/31 05:09:25 |
2 |
|
3 |
Modified: vzctl-9999.ebuild ChangeLog vzctl-3.0.30.2.ebuild |
4 |
Removed: vzctl-3.0.28.3-r1.ebuild |
5 |
Log: |
6 |
Sync 9999 with the latest ebuild, drop old. |
7 |
|
8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.9 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.9&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?rev=1.9&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?r1=1.8&r2=1.9 |
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.8 |
21 |
retrieving revision 1.9 |
22 |
diff -u -r1.8 -r1.9 |
23 |
--- vzctl-9999.ebuild 21 Sep 2011 09:04:52 -0000 1.8 |
24 |
+++ vzctl-9999.ebuild 31 Mar 2012 05:09:25 -0000 1.9 |
25 |
@@ -1,10 +1,10 @@ |
26 |
-# Copyright 1999-2011 Gentoo Foundation |
27 |
+# Copyright 1999-2012 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.8 2011/09/21 09:04:52 mgorny Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.9 2012/03/31 05:09:25 pva Exp $ |
31 |
|
32 |
EAPI="4" |
33 |
|
34 |
-inherit bash-completion autotools git-2 |
35 |
+inherit bash-completion-r1 autotools git-2 |
36 |
|
37 |
DESCRIPTION="OpenVZ ConTainers control utility" |
38 |
HOMEPAGE="http://openvz.org/" |
39 |
@@ -14,7 +14,7 @@ |
40 |
LICENSE="GPL-2" |
41 |
SLOT="0" |
42 |
KEYWORDS="" |
43 |
-IUSE="bash-completion" |
44 |
+IUSE="" |
45 |
|
46 |
RDEPEND=" |
47 |
net-firewall/iptables |
48 |
@@ -34,7 +34,7 @@ |
49 |
econf \ |
50 |
--localstatedir=/var \ |
51 |
--enable-udev \ |
52 |
- $(use_enable bash-completion bashcomp) \ |
53 |
+ --enable-bashcomp \ |
54 |
--enable-logrotate |
55 |
} |
56 |
|
57 |
@@ -43,7 +43,7 @@ |
58 |
|
59 |
# install the bash-completion script into the right location |
60 |
rm -rf "${ED}"/etc/bash_completion.d |
61 |
- dobashcompletion etc/bash_completion.d/vzctl.sh vzctl |
62 |
+ newbashcomp etc/bash_completion.d/vzctl.sh ${PN} |
63 |
|
64 |
# We need to keep some dirs |
65 |
keepdir /vz/{dump,lock,root,private,template/cache} |
66 |
@@ -51,33 +51,12 @@ |
67 |
} |
68 |
|
69 |
pkg_postinst() { |
70 |
- bash-completion_pkg_postinst |
71 |
- local conf_without_OSTEMPLATE |
72 |
- for file in \ |
73 |
- $(find "${EROOT}/etc/vz/conf/" \( -name *.conf -a \! -name 0.conf \)); do |
74 |
- if ! grep '^OSTEMPLATE' $file > /dev/null; then |
75 |
- conf_without_OSTEMPLATE+=" $file" |
76 |
- fi |
77 |
- done |
78 |
- |
79 |
- if [[ -n ${conf_without_OSTEMPLATE} ]]; then |
80 |
- ewarn |
81 |
- ewarn "OSTEMPLATE default was changed from redhat-like to gentoo." |
82 |
- ewarn "This means that any VEID.conf files without explicit or correct" |
83 |
- ewarn "OSTEMPLATE set will use gentoo scripts instead of redhat." |
84 |
- ewarn "Please check the following configs:" |
85 |
- for file in ${conf_without_OSTEMPLATE}; do |
86 |
- ewarn "${file}" |
87 |
- done |
88 |
- ewarn |
89 |
- fi |
90 |
- |
91 |
ewarn "To avoid loosing network to CTs on iface down/up, please, add the" |
92 |
ewarn "following code to /etc/conf.d/net:" |
93 |
ewarn " postup() {" |
94 |
ewarn " /usr/sbin/vzifup-post \${IFACE}" |
95 |
ewarn " }" |
96 |
- ewarn |
97 |
+ |
98 |
ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs." |
99 |
ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and" |
100 |
ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use" |
101 |
|
102 |
|
103 |
|
104 |
1.89 sys-cluster/vzctl/ChangeLog |
105 |
|
106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?rev=1.89&view=markup |
107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?rev=1.89&content-type=text/plain |
108 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?r1=1.88&r2=1.89 |
109 |
|
110 |
Index: ChangeLog |
111 |
=================================================================== |
112 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v |
113 |
retrieving revision 1.88 |
114 |
retrieving revision 1.89 |
115 |
diff -u -r1.88 -r1.89 |
116 |
--- ChangeLog 31 Mar 2012 05:04:47 -0000 1.88 |
117 |
+++ ChangeLog 31 Mar 2012 05:09:25 -0000 1.89 |
118 |
@@ -1,6 +1,10 @@ |
119 |
# ChangeLog for sys-cluster/vzctl |
120 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
121 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.88 2012/03/31 05:04:47 pva Exp $ |
122 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.89 2012/03/31 05:09:25 pva Exp $ |
123 |
+ |
124 |
+ 31 Mar 2012; Peter Volkov <pva@g.o> -vzctl-3.0.28.3-r1.ebuild, |
125 |
+ vzctl-3.0.30.2.ebuild, vzctl-9999.ebuild: |
126 |
+ Sync 9999 with the latest ebuild, drop old. |
127 |
|
128 |
*vzctl-3.0.30.2 (31 Mar 2012) |
129 |
|
130 |
|
131 |
|
132 |
|
133 |
1.2 sys-cluster/vzctl/vzctl-3.0.30.2.ebuild |
134 |
|
135 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild?rev=1.2&view=markup |
136 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild?rev=1.2&content-type=text/plain |
137 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild?r1=1.1&r2=1.2 |
138 |
|
139 |
Index: vzctl-3.0.30.2.ebuild |
140 |
=================================================================== |
141 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild,v |
142 |
retrieving revision 1.1 |
143 |
retrieving revision 1.2 |
144 |
diff -u -r1.1 -r1.2 |
145 |
--- vzctl-3.0.30.2.ebuild 31 Mar 2012 05:04:47 -0000 1.1 |
146 |
+++ vzctl-3.0.30.2.ebuild 31 Mar 2012 05:09:25 -0000 1.2 |
147 |
@@ -1,6 +1,6 @@ |
148 |
# Copyright 1999-2012 Gentoo Foundation |
149 |
# Distributed under the terms of the GNU General Public License v2 |
150 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild,v 1.1 2012/03/31 05:04:47 pva Exp $ |
151 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.30.2.ebuild,v 1.2 2012/03/31 05:09:25 pva Exp $ |
152 |
|
153 |
EAPI="4" |
154 |
|
155 |
@@ -24,7 +24,7 @@ |
156 |
DEPEND="${RDEPEND}" |
157 |
|
158 |
src_prepare() { |
159 |
- # Set default OSTEMPLATE on gentoo added in vzctl-3.0.24 (29 Jun 2010) |
160 |
+ # Set default OSTEMPLATE on gentoo added |
161 |
sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die |
162 |
} |