Patch to fix adjusting of memory limits without VE restart.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

5 files changed, 143 insertions, 9 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index f5635c0de83c..2ab34c652df0 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.58 2008/10/13 09:35:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.59 2008/11/08 19:41:59 pva Exp $
+
+*vzctl-3.0.22-r11 (08 Nov 2008)
+*vzctl-3.0.22-r2 (08 Nov 2008)
+
+  08 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/vzctl-3.0.22-adjust-meminfo.patch, +vzctl-3.0.22-r2.ebuild,
+  -vzctl-3.0.22-r10.ebuild, +vzctl-3.0.22-r11.ebuild:
+  Patch to fix adjusting of memory limits without VE restart.
 
   13 Oct 2008; Peter Volkov <pva@gentoo.org>
   -files/vzctl-3.0.16-prevent-stripping.patch, -vzctl-3.0.18-r1.ebuild,
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 926f6c92f166..c01a9bcb9dbe 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,4 +1,5 @@
 AUX vz.initd 5465 RMD160 303e4877e95db9f90d512b37d67cdaa94e823d52 SHA1 967cc1a9d71109db574f565d2f733332cfafcf50 SHA256 63c17d2783cfd01fcfb66aa8b0c572ea6bf366d59a72c10f1728091c7eaa5fc0
+AUX vzctl-3.0.22-adjust-meminfo.patch 1521 RMD160 e414657c8dc723b254b86dc05f80bf505fe847e2 SHA1 caae359fff43efdaa54cc29810adfbbcb2fac922 SHA256 65e1536a7695b2387d9b228882bcb436490a668301e4b590104deac78d2b34d3
 AUX vzctl-3.0.22-capability-fix.patch 1037 RMD160 d244af55f1eaf249d1db04e53ab452aeec5e32f5 SHA1 bb6699627ddedaa524e4858e3c46e3bce50fb1f1 SHA256 977eea8154c3276fbab5a091cd30cf5072e26e7a9957b3aaa4428eacd3be0e56
 AUX vzctl-3.0.22-document-disable-modules.patch 843 RMD160 635e9417e3bbdef88d447f65e7d8007b89ba52ad SHA1 b6c1bc340ed29efe9ebf99d50b214b4c03e23379 SHA256 e2f4d5b3d3447eb6a4086ec3ff1ab5e8cc10797afe4febc3f06847a94430e6d5
 AUX vzctl-3.0.22-glibc28.patch 758 RMD160 633a9feb1a7101a166aa8e090fac4b5720546d0c SHA1 d19fb01c59366eb97da8178864ddda88010b7110 SHA256 36021ca9dabe548075ca016db047131f3536f916b2fa620ed61b00c41545e19e
@@ -6,6 +7,7 @@ AUX vzctl-3.0.22-scripts-openrc.patch 6804 RMD160 3535f073b8fd99749891e28dfb5843
 AUX vzctl-3.0.22-workaround-gentoo-add_ip.patch 1250 RMD160 d77d99b74ed55894a947d6651f3a8471f3f582ff SHA1 a3da293f85076cc8c86f68c128733e57ddba8b56 SHA256 b5d52398a85d947ceebcd7db17fbd6ec602bb03c338ec4af5b202a814e226730
 DIST vzctl-3.0.22.tar.bz2 360012 RMD160 53353981fefea94d997b3555600583f4c5818833 SHA1 58e5c55855aebf9e4ca032b325d8960a3836d648 SHA256 20f75e8342b85909d6bf01d0db47acaa088125da7f203b5e6e6169aa4c139166
 EBUILD vzctl-3.0.22-r1.ebuild 2585 RMD160 3a26d40c46dc4e7052184eaf9fb7f96bb1cbdf76 SHA1 0e673748b748658799e7e4646c789e73fc44161f SHA256 be918b625ea4a3c411402f596a04939912e82c6de1a173fb9f86180fc08e9b73
-EBUILD vzctl-3.0.22-r10.ebuild 2613 RMD160 9bfa3722615f22e6e0b2efeefb738fa251ea9db0 SHA1 9916ed88dde7403d778df002f9356c91ee59eb53 SHA256 259d015efa14dc10434badfcc7a726fba49fe087f80ca4c7b4e4ce757c8ff481
-MISC ChangeLog 11261 RMD160 75c351b18e6b8a8767d9744a855ced75ba574e9d SHA1 b3c34860a382b6435e8ed13db0cb7d6204d8db94 SHA256 6a666c4311d593ed81af618543996712786defd995325604044b02ae0268885a
+EBUILD vzctl-3.0.22-r11.ebuild 2661 RMD160 b5b9afe96676dcd0e406910b3a547eb5908f7d3f SHA1 047e04ce8d7b2011a5d809e0c1e8e04fcc4a66a6 SHA256 61c5c872b5d888ca08574abe5c6c90bf27f81fd63bc3535545352b1c1aed3c10
+EBUILD vzctl-3.0.22-r2.ebuild 2635 RMD160 1af38bcd6d72c810e7114a957a49fc9c71c9d2ce SHA1 4569beda0805201dc597bb1376549dfd3977091c SHA256 2a1fe5bc22628b4063c287aa7adb1f7633da0f84989337e73fc15de6613897f8
+MISC ChangeLog 11556 RMD160 630eefa6904aa030c95fb3c694988163d7c9f000 SHA1 552fdafe40d6fef1ffccd34127c0fc0f6a229880 SHA256 780f38196a6fa9883cb7b62982834bf8208a9e6306fc90e2ef00f1060a61cdd8
 MISC metadata.xml 332 RMD160 b40e74088fb74ddb66a5eda7f46bf63742e2258a SHA1 719e3d0e91af2df78aa7478990ef65c307fb0c31 SHA256 30e1f46e13b10bc59d15c29e986bf8d8aab98ce8338c33d6f37650f399ebb4b2
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.22-adjust-meminfo.patch b/sys-cluster/vzctl/files/vzctl-3.0.22-adjust-meminfo.patch
new file mode 100644
index 000000000000..f26a789b6fd9
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.22-adjust-meminfo.patch
@@ -0,0 +1,42 @@
+From: Igor Sukhih <igor@openvz.org>
+Date: Thu, 30 Oct 2008 13:00:46 +0000 (+0300)
+Subject: vzctl: adjust /proc/meminfo when privvmpages or --meminfo changes
+X-Git-Tag: vzctl-3.0.23~1
+X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=17705858ad37d34c2caa3f89d3af5bf2ad34073a;hp=372cd4f09f58a62a3dc05152ae288ad2b083a5b2
+
+vzctl: adjust /proc/meminfo when privvmpages or --meminfo changes
+
+Fixes http://bugzilla.openvz.org/623
+---
+
+diff --git a/src/lib/meminfo.c b/src/lib/meminfo.c
+index 6c686ad..c4102c0 100644
+--- a/src/lib/meminfo.c
++++ b/src/lib/meminfo.c
+@@ -51,13 +51,20 @@ int vps_meminfo_set(vps_handler *h, envid_t veid, meminfo_param *gparam,
+ 		/* update meminfo on --privvmpages, --meminfo */
+ 		if (param->mode < 0 && privvmpages == NULL)
+ 			return 0;
+-		if (gparam->mode < 0 && vps_p->g_param != NULL) {
+-			param = &vps_p->g_param->res.meminfo;
+-			if (param->mode != VE_MEMINFO_PRIVVMPAGES)
+-				return 0;
++		if (vps_p->g_param != NULL) {
++			if (privvmpages == NULL)
++				/* use privvmpages from VE.conf on --meminfo */
++				privvmpages = vps_p->g_param->res.ub.privvmpages;
++
++			if (param->mode < 0) {
++				/* use meminfo from VE.conf on --privvmpages */
++				param = &vps_p->g_param->res.meminfo;
++				if (param->mode < 0)
++					param = &default_param;
++				if (param->mode != VE_MEMINFO_PRIVVMPAGES)
++					return 0;
++			}
+ 		}
+-		if (privvmpages == NULL && vps_p->g_param != NULL)
+-			privvmpages = vps_p->g_param->res.ub.privvmpages;
+ 	}
+ 	if (param->mode < 0)
+ 		param = &default_param;
diff --git a/sys-cluster/vzctl/vzctl-3.0.22-r10.ebuild b/sys-cluster/vzctl/vzctl-3.0.22-r11.ebuild
index f9cf8084db47..49f724ad81a1 100644
--- a/sys-cluster/vzctl/vzctl-3.0.22-r10.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.22-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22-r10.ebuild,v 1.1 2008/10/13 09:25:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22-r11.ebuild,v 1.1 2008/11/08 19:41:59 pva Exp $
 
 inherit bash-completion eutils
 
@@ -26,11 +26,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-capability-fix.patch
-	epatch "${FILESDIR}"/${P}-glibc28.patch
-	epatch "${FILESDIR}"/${P}-document-disable-modules.patch
-	epatch "${FILESDIR}"/${P}-workaround-gentoo-add_ip.patch
-	epatch "${FILESDIR}"/${P}-scripts-openrc.patch
+	epatch "${FILESDIR}/${P}-capability-fix.patch"
+	epatch "${FILESDIR}/${P}-glibc28.patch"
+	epatch "${FILESDIR}/${P}-document-disable-modules.patch"
+	epatch "${FILESDIR}/${P}-workaround-gentoo-add_ip.patch"
+	epatch "${FILESDIR}/${P}-scripts-openrc.patch"
+	epatch "${FILESDIR}/${P}-adjust-meminfo.patch"
 }
 
 src_compile() {
diff --git a/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild b/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild
new file mode 100644
index 000000000000..9f637386dd7c
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.22-r2.ebuild,v 1.1 2008/11/08 19:41:59 pva Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="OpenVZ VE 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 logrotate"
+
+RDEPEND="logrotate? ( app-admin/logrotate )
+	net-firewall/iptables
+	sys-apps/ed
+	sys-apps/iproute2
+	sys-fs/vzquota
+	virtual/cron"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-capability-fix.patch"
+	epatch "${FILESDIR}/${P}-glibc28.patch"
+	epatch "${FILESDIR}/${P}-document-disable-modules.patch"
+	epatch "${FILESDIR}/${P}-workaround-gentoo-add_ip.patch"
+	epatch "${FILESDIR}/${P}-adjust-meminfo.patch"
+}
+
+src_compile() {
+	econf --localstatedir=/var \
+		--enable-cron \
+		--enable-udev \
+		$(use_enable bash-completion bashcomp) \
+		$(use_enable logrotate) || die "econf failed!"
+
+	emake || die "emake failed!"
+}
+
+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
+	ewarn
+	if has_version "<sys-cluster/vzctl-3.0.10"; then
+		ewarn "The location of some vzctl files have changed. Most notably,"
+		ewarn "VE configuration files and samples directory has changed from"
+		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
+		ewarn "your VEs, please do the following:"
+		ewarn
+		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
+		ewarn
+	fi
+	ewarn "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the"
+	ewarn "interfaces to send ARP requests to has been improved (see description"
+	ewarn "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case VE IP addresses"
+	ewarn "are not on the same subnet as HN IPs, it may lead to such VEs being"
+	ewarn "unreachable from the outside world."
+	ewarn
+	ewarn "The solution is to set up a device route(s) for the network your VEs are"
+	ewarn "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1"
+	ewarn
+	ewarn "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any"
+	ewarn 'value other than "detect" in /etc/vz/vz.conf.'
+}