diff options
author | 2010-07-30 10:14:50 +0000 | |
---|---|---|
committer | 2010-07-30 10:14:50 +0000 | |
commit | 8e0703dd8e2bd50be8d3391d5ca86cd39c3fa288 (patch) | |
tree | 93b4be2b7a7aa9e251760b1714210d9f4b48817b | |
parent | sys-kernel/gentoo-sources: added 2.6.27.48 patchset. (diff) | |
download | pva-8e0703dd8e2bd50be8d3391d5ca86cd39c3fa288.tar.gz pva-8e0703dd8e2bd50be8d3391d5ca86cd39c3fa288.tar.bz2 pva-8e0703dd8e2bd50be8d3391d5ca86cd39c3fa288.zip |
sys-cluster/vzctl: version bump. Added patch to fix vzpostup.
svn path=/; revision=439
17 files changed, 1465 insertions, 0 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog new file mode 100644 index 0000000..ea8c76b --- /dev/null +++ b/sys-cluster/vzctl/ChangeLog @@ -0,0 +1,386 @@ +# ChangeLog for sys-cluster/vzctl +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.70 2010/07/02 15:11:05 pva Exp $ + + 02 Jul 2010; Peter Volkov <pva@gentoo.org> vzctl-3.0.24.ebuild: + Fix QA warning: econf should be in src_configure. + +*vzctl-3.0.24 (29 Jun 2010) + + 29 Jun 2010; Peter Volkov <pva@gentoo.org> +vzctl-3.0.24.ebuild, + vzctl-9999.ebuild: + Version bump. Everything we did is finally upstream! Dropped old warn + message from 9999 version. + + 21 Nov 2009; Peter Volkov <pva@gentoo.org> -vzctl-3.0.22-r2.ebuild, + -files/vzctl-3.0.22-adjust-meminfo.patch, + -files/vzctl-3.0.22-capability-fix.patch, + -files/vzctl-3.0.22-document-disable-modules.patch, + -files/vzctl-3.0.22-glibc28.patch, + -files/vzctl-3.0.22-workaround-gentoo-add_ip.patch, metadata.xml: + Drop old. + + 06 Nov 2009; Peter Volkov <pva@gentoo.org> vzctl-9999.ebuild: + Rename VE -> CT (like upstream already did). + + 27 Oct 2009; Peter Volkov <pva@gentoo.org> vzctl-9999.ebuild: + Nuke logrotate USE flag in git ebuild too. + + 21 Oct 2009; Peter Volkov <pva@gentoo.org> vzctl-9999.ebuild: + Small clenup to restore DESCRIPTION, thank Mr_Bones_ for report. + +*vzctl-9999 (20 Oct 2009) + + 20 Oct 2009; Peter Volkov <pva@gentoo.org> -vzctl-3.0.22-r1.ebuild, + vzctl-3.0.23-r2.ebuild, +vzctl-9999.ebuild: + amd64/x86 stable, bug #199738. Removed old. Added git ebuild, thank + Andrian Nord for suggestion in bug #259433. + +*vzctl-3.0.23-r2 (05 Apr 2009) + + 05 Apr 2009; Peter Volkov <pva@gentoo.org> + +files/vzctl-3.0.23-cronjobs-dstdir-check.patch, + files/vzctl-3.0.23-cronjobs-issue-warning.patch, + +files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch, + -files/vzctl-3.0.23-cronjobs-typo-fix.patch, + +files/vzctl-3.0.23-cronjobs-wightspace.patch, + +files/vzctl-3.0.23-multiple-cron-jobs.patch, -vzctl-3.0.23-r1.ebuild, + +vzctl-3.0.23-r2.ebuild: + Upstream accepted patches merged back, some other bits rewritten as they + asked us. + + 31 Mar 2009; Peter Volkov <pva@gentoo.org> vzctl-3.0.23-r1.ebuild: + Nuke logrotate USE flag, bug #258174. + +*vzctl-3.0.23-r1 (31 Mar 2009) + + 31 Mar 2009; Peter Volkov <pva@gentoo.org> + +files/vzctl-3.0.23-UBC-parameter-swappages.patch, + +files/vzctl-3.0.23-cronjobs-issue-warning.patch, + +files/vzctl-3.0.23-cronjobs-typo-fix.patch, + +files/vzctl-3.0.23-debian-CT-ipv6-fix.patch, + +files/vzctl-3.0.23-forwarding-issue-warning.patch, + -files/vzctl-3.0.23-ipforwarding-on-start.patch, + +files/vzctl-3.0.23-ppp-feature.patch, + -files/vzctl-3.0.23-set-cron-jobs.patch, + files/vzctl-3.0.23-ve-unlimited.conf-sample.patch, + +files/vzctl-3.0.23-vzarp-on-ifup.patch, + +files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch, + vzctl-3.0.22-r2.ebuild, -vzctl-3.0.23.ebuild, +vzctl-3.0.23-r1.ebuild: + Backport some fixes from git, update patches to be likely included (or + already included) by upstream. Remove old. Stabilize 3.0.22-r2. + +*vzctl-3.0.23 (15 Nov 2008) + + 15 Nov 2008; Peter Volkov <pva@gentoo.org> + -files/vzctl-3.0.22-scripts-openrc.patch, + +files/vzctl-3.0.23-ipforwarding-on-start.patch, + +files/vzctl-3.0.23-set-cron-jobs.patch, + +files/vzctl-3.0.23-ve-unlimited.conf-sample.patch, -files/vz.initd, + -vzctl-3.0.22-r11.ebuild, +vzctl-3.0.23.ebuild: + Version bump. + +*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, + -vzctl-3.0.22.ebuild, vzctl-3.0.22-r1.ebuild: + amd64/x86 stable, bug #199738. Removed old. + +*vzctl-3.0.22-r10 (13 Oct 2008) + + 13 Oct 2008; Peter Volkov <pva@gentoo.org> + +files/vzctl-3.0.22-scripts-openrc.patch, +vzctl-3.0.22-r10.ebuild: + Made scripts openvz compatible. Skipped revisions to have possibility to + put major updates (e.g. security) without this changes applied. + + 28 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml: + Update metadata.xml to include USE flag descriptions. Entries taken from + profiles/use.local.desc + +*vzctl-3.0.22-r1 (14 Jul 2008) + + 14 Jul 2008; Peter Volkov <pva@gentoo.org> + +files/vzctl-3.0.22-capability-fix.patch, + +files/vzctl-3.0.22-document-disable-modules.patch, + +files/vzctl-3.0.22-glibc28.patch, + +files/vzctl-3.0.22-workaround-gentoo-add_ip.patch, + +vzctl-3.0.22-r1.ebuild: + Fix inability to start container when built against + >=linux-headers-2.6.25, bug #221971, thank Romain Riviere for report; Fix + build glibc-2.8 problem, bug #228189, thank Evil Compile Person for report + and Bandan for patch; Added notice in configuration file on how to disable + modules loading, bug #213798, thank Victor Roman Archidona for report. + + 14 Mar 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml: + fix metadata + + 30 Jan 2008; <pva@gentoo.org> vzctl-3.0.22.ebuild: + x86/amd64 stable, bug 199738. + + 12 Jan 2008; <pva@gentoo.org> vzctl-3.0.22.ebuild: + Added compatibility note, announced by OpenVZ team. + +*vzctl-3.0.22 (24 Dec 2007) + + 24 Dec 2007; <pva@gentoo.org> -vzctl-3.0.16.ebuild, -vzctl-3.0.18.ebuild, + vzctl-3.0.18-r1.ebuild, +vzctl-3.0.22.ebuild: + Version bump. 3.0.18-r1 - x86/amd64 stable, bug 199738. Remove old from the + tree. + + 20 Nov 2007; <pva@gentoo.org> -files/vzctl-3.0.14-ndsend.c.patch, + metadata.xml, -vzctl-3.0.0.8.ebuild, -vzctl-3.0.14.ebuild: + Added myself into metadata. Clean old. + +*vzctl-3.0.18-r1 (16 Aug 2007) + + 16 Aug 2007; Christian Heim <phreak@gentoo.org> +vzctl-3.0.18-r1.ebuild: + Revision bump, hopefully keeping all necessary configuration directories + (thanks to geek at alum.rpi.edu in #187931). + + 13 Jul 2007; Christian Heim <phreak@gentoo.org> vzctl-3.0.16.ebuild, + -vzctl-3.0.17.ebuild, vzctl-3.0.18.ebuild: + Removing vzctl-3.0.17. Adding the keepdir for /etc/vz/names as Kir pointed + in the mail from today. + +*vzctl-3.0.18 (06 Jul 2007) + + 06 Jul 2007; Christian Heim <phreak@gentoo.org> +vzctl-3.0.18.ebuild: + Version bump, fixing the initscript to work with 2.6.9 based kernels + (openvz-sources-023.*). + +*vzctl-3.0.17 (06 Jul 2007) + + 06 Jul 2007; Christian Heim <phreak@gentoo.org> +vzctl-3.0.17.ebuild: + Version bump, fixing 'a lot of bugs' either in code or documentation; + ArchLinux support for VE's; init-script improvements as well as IPv6 + fixes/improvements. For a full ChangeLog see + http://git.openvz.org/?p=vzctl;a=shortlog;h=vzctl-3.0.17-1. + + 03 Jun 2007; Christian Heim <phreak@gentoo.org> vzctl-3.0.16.ebuild: + Marking vzctl-3.0.16 stable on amd64 and x86. + +*vzctl-3.0.16 (14 Mar 2007) + + 14 Mar 2007; Christian Heim <phreak@gentoo.org> + +files/vzctl-3.0.16-prevent-stripping.patch, +vzctl-3.0.16.ebuild: + Version bump (including a patch preventing vzctl from prestripping). + + 23 Jan 2007; Christian Heim <phreak@gentoo.org> files/digest-vzctl-3.0.14, + Manifest: + Fixing the Manifest (thanks to samLT <samuelethiec at hotmail.com> in #163296). + + 21 Jan 2007; Benedikt Böhm <hollow@gentoo.org> -files/vz-3.0.10.initd, + -vzctl-3.0.13.ebuild, vzctl-3.0.14.ebuild: + fix #158114; cleanup + + 18 Jan 2007; Christian Heim <phreak@gentoo.org> vzctl-3.0.14.ebuild: + Cleaning up the ebuild a bit (thanks to Kir Kolyshkin <kir@openvz.org> for + being a pain in the ass :)). + +*vzctl-3.0.14 (18 Jan 2007) + + 18 Jan 2007; Christian Heim <phreak@gentoo.org> + +files/vzctl-3.0.14-ndsend.c.patch, +vzctl-3.0.14.ebuild: + Initial ebuild for 3.0.14, including a build-time fix (thanks to Kir + Kolyshkin <kir@openvz.org>). + + 03 Dec 2006; Benedikt Böhm <hollow@gentoo.org> vzctl-3.0.13.ebuild: + ovz bug #254 has been solved; add ~ppc64 and ~sparc; cleanup + + 29 Nov 2006; Christian Heim <phreak@gentoo.org> -vzctl-3.0.11-r1.ebuild, + -vzctl-3.0.12.ebuild: + Cleaning up some old versions, 3.0.13 is our new target for stable. + +*vzctl-3.0.13 (29 Nov 2006) + + 29 Nov 2006; Christian Heim <phreak@gentoo.org> vzctl-3.0.12.ebuild, + +vzctl-3.0.13.ebuild: + Version bump, UPSTREAM accepted all our patches (so no need to use our + seperate tarball)! + +*vzctl-3.0.12 (12 Oct 2006) + + 12 Oct 2006; Christian Heim <phreak@gentoo.org> -vzctl-3.0.11.ebuild, + +vzctl-3.0.12.ebuild: + Version bump (partly fixing #150897); cleaning older version(s). + + 06 Sep 2006; Benedikt Böhm <hollow@gentoo.org> vzctl-3.0.11-r1.ebuild: + add info for new SRC_URI for future releases + + 06 Sep 2006; Christian Heim <phreak@gentoo.org> vzctl-3.0.11.ebuild, + vzctl-3.0.11-r1.ebuild: + Fixing my ebuild comments (rephrasing, clarifying). + +*vzctl-3.0.11-r1 (06 Sep 2006) + + 06 Sep 2006; Benedikt Böhm <hollow@gentoo.org> + -files/vzctl-3.0.10-Makefile.patch, -files/vzctl-3.0.10-as-needed.patch, + -vzctl-3.0.10-r2.ebuild, +vzctl-3.0.11-r1.ebuild: + fix VPSCONFDIR in init script; let user configure UBC for VE0; add udev + rules for /dev/vzctl; fix check for /dev/vzctl + +*vzctl-3.0.11 (27 Aug 2006) + + 27 Aug 2006; Christian Heim <phreak@gentoo.org> +vzctl-3.0.11.ebuild: + Finally adding vzctl-3.0.11, finally fixing all --as-needed and rpath + related issues we had in the past. + + 09 Jul 2006; Christian Heim <phreak@gentoo.org> -vzctl-3.0.10.ebuild, + -vzctl-3.0.10-r1.ebuild: + More cleanups + + 09 Jul 2006; Christian Heim <phreak@gentoo.org> -vzctl-3.0.0.4.ebuild, + -vzctl-3.0.0.7.ebuild, vzctl-3.0.0.8.ebuild: + Marking vzctl-3.0.0.8 stable on x86/amd64; Pruning old versions + +*vzctl-3.0.10-r2 (09 Jul 2006) + + 09 Jul 2006; Christian Heim <phreak@gentoo.org> files/vz-3.0.10.initd, + +vzctl-3.0.10-r2.ebuild: + Revision bump, hopefully completly fixing #138462 and #138469 + +*vzctl-3.0.10-r1 (28 Jun 2006) + + 28 Jun 2006; Christian Heim <phreak@gentoo.org> + files/vzctl-3.0.10-Makefile.patch, +files/vz-3.0.10.initd, + vzctl-3.0.10.ebuild, +vzctl-3.0.10-r1.ebuild: + Revision bump, fixing vzctl-3.0.10-Makefile.patch. Now also installs + vpsnetclean and vpsreboot scripts into /usr/share/vzctl/scripts. Including + initscript changes from Kir Kolyshkin <kir@openvz.org> + + 22 Jun 2006; Benedikt Böhm <hollow@gentoo.org> vzctl-3.0.10.ebuild: + fix libdir; add warning + +*vzctl-3.0.10 (19 Jun 2006) + + 19 Jun 2006; Christian Heim <phreak@gentoo.org> + +files/vzctl-3.0.10-Makefile.patch, +files/vzctl-3.0.10-as-needed.patch, + +vzctl-3.0.10.ebuild: + Version bump, the OpenVZ finally decided to use a sane version scheme, + reworked the ebuild (fixed the quoting on user-influence-able variables) and + also added a patch to remove all those nifty unneeded things from the + Makefile. Another addition is the --as-needed patch from Igor Sukhih + <igor@openvz.org>. For a detailed ChangeLog see + http://openvz.org/news/updates/vzctl-3.0.10-1! + +*vzctl-3.0.0.8 (24 Apr 2006) + + 24 Apr 2006; Christian Heim <phreak@gentoo.org> +vzctl-3.0.0.8.ebuild: + Version bump, see http://openvz.org/news/updates/vzctl-3.0.0-8 for a + detailed ChangeLog + + 21 Apr 2006; Christian Heim <phreak@gentoo.org> vzctl-3.0.0.7.ebuild: + Ripping of the CONFIG_CHECK's and the VZKERNEL_HEADERS + + 20 Apr 2006; Christian Heim <phreak@gentoo.org> -vzctl-2.7.0.26.ebuild: + Removing old ebuild(s) + +*vzctl-3.0.0.7 (20 Apr 2006) + + 20 Apr 2006; Christian Heim <phreak@gentoo.org> +vzctl-3.0.0.7.ebuild: + Version bump (vzctl should now support live migration); + vzctl is now licensed under GPL-2! Adding LDFLAGS filter + + 11 Apr 2006; Christian Heim <phreak@gentoo.org> vzctl-3.0.0.4.ebuild: + Marking vzctl-3.0.0.4 stable on amd64/x86 + + 10 Apr 2006; Christian Heim <phreak@gentoo.org> vzctl-2.7.0.26.ebuild, + vzctl-3.0.0.4.ebuild: + Fixing IUSE + +*vzctl-3.0.0.4 (21 Mar 2006) + + 21 Mar 2006; Benedikt Boehm <hollow@gentoo.org> -vzctl-3.0.0.2-r1.ebuild, + +vzctl-3.0.0.4.ebuild: + Version bump + + 08 Mar 2006; Christian Heim <phreak@gentoo.org> -vzctl-2.7.0.24.ebuild, + vzctl-2.7.0.26.ebuild, -vzctl-3.0.0.2.ebuild: + Marking vzctl-2.7.0.26 stable on x86, amd64; Removing old ebuilds + +*vzctl-3.0.0.2-r1 (01 Mar 2006) + + 01 Mar 2006; Benedikt Boehm <hollow@gentoo.org> +vzctl-3.0.0.2-r1.ebuild: + fix ovz bug #108 and #111 + +*vzctl-3.0.0.2 (23 Feb 2006) + + 23 Feb 2006; Benedikt Boehm <hollow@gentoo.org> -vzctl-2.7.0.24-r1.ebuild, + -vzctl-2.7.0.25.ebuild, -vzctl-2.7.0.25-r1.ebuild, +vzctl-3.0.0.2.ebuild: + Version bump + +*vzctl-2.7.0.26 (18 Feb 2006) + + 18 Feb 2006; Christian Heim <phreak@gentoo.org> +vzctl-2.7.0.26.ebuild: + Version bump + +*vzctl-2.7.0.25-r1 (18 Feb 2006) +*vzctl-2.7.0.24-r1 (18 Feb 2006) + + 18 Feb 2006; Christian Heim <phreak@gentoo.org> +vzctl-2.7.0.24-r1.ebuild, + +vzctl-2.7.0.25-r1.ebuild: + Modifying the ebuild to remove /etc/sysconfig; Its completly unnecessary + on Gentoo + + 18 Feb 2006; Christian Heim <phreak@gentoo.org> + -files/vzctl-2.7.0.23-gentoo_etc_vz.patch, -files/vzctl-2.7.0-amd64.patch, + -files/vzctl-2.7.0.24-pic.patch, -files/vzctl-2.7.0-gentoo_conf_d.patch, + vzctl-2.7.0.24.ebuild, vzctl-2.7.0.25.ebuild: + Moving patches to a seperate patch tarball + + 12 Jan 2006; Benedikt Boehm <hollow@gentoo.org> + +files/vzctl-2.7.0-amd64.patch, +files/vzctl-2.7.0.24-pic.patch, + vzctl-2.7.0.24.ebuild, vzctl-2.7.0.25.ebuild: + fix PIC and multilib on amd64 + +*vzctl-2.7.0.25 (12 Jan 2006) + + 12 Jan 2006; Benedikt Boehm <hollow@gentoo.org> +vzctl-2.7.0.25.ebuild: + Version bump + + 26 Dec 2005; Benedikt Boehm <hollow@gentoo.org> vzctl-2.7.0.24.ebuild: + marked stable amd64 + + 01 Dec 2005; Benedikt Boehm <hollow@gentoo.org> + -files/vzctl-2.7.0-gentoo_etc_vz.patch, -vzctl-2.7.0.21.ebuild, + -vzctl-2.7.0.22.ebuild, -vzctl-2.7.0.23.ebuild, vzctl-2.7.0.24.ebuild: + 2.7.0.24 marked x86, ~amd64; cleanup + + 26 Nov 2005; Christian Heim <phreak@gentoo.org> metadata.xml: + Fixing metadata.xml to include the maintainer email + +*vzctl-2.7.0.24 (02 Nov 2005) + + 02 Nov 2005; Christian Heim <phreak@gentoo.org> +vzctl-2.7.0.24.ebuild: + New upstream release + + 21 Oct 2005; Christian Heim <phreak@gentoo.org> + files/vzctl-2.7.0.23-gentoo_etc_vz.patch: + Adding kir's recent patch to fix installation of vzctl-2.7.0.23 + +*vzctl-2.7.0.23 (21 Oct 2005) + + 21 Oct 2005; Benedikt Boehm <hollow@gentoo.org> +vzctl-2.7.0.23.ebuild: + Version bump + +*vzctl-2.7.0.22 (28 Sep 2005) + + 28 Sep 2005; Christian Heim <phreak@gentoo.org> +vzctl-2.7.0.22.ebuild: + New version; According to kir, its fixing a minor bug occuring when running + 'vzctl enter' + +*vzctl-2.7.0.21 (26 Sep 2005) + + 26 Sep 2005; Benedikt Boehm <hollow@gentoo.org> + +files/vzctl-2.7.0-gentoo_conf_d.patch, + +files/vzctl-2.7.0-gentoo_etc_vz.patch, +files/vz.initd, +metadata.xml, + +vzctl-2.7.0.21.ebuild: + Initial release. thx to kir + diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest new file mode 100644 index 0000000..4a1143c --- /dev/null +++ b/sys-cluster/vzctl/Manifest @@ -0,0 +1,17 @@ +AUX vzctl-3.0.23-UBC-parameter-swappages.patch 5482 RMD160 81ec766ef3263caf59e3e1c6048f632498949f5d SHA1 d1b0462ced780602cfcb850993f75a8a724b299d SHA256 c4ce00e8cddc8f3334847a3f8e700ab34a39b5dbfff8613a145de0f68147b2b0 +AUX vzctl-3.0.23-cronjobs-dstdir-check.patch 2119 RMD160 60b3d0b76e6cb393e04a8859eebf05d3da389247 SHA1 9429b33d2e276e0d80a07aa58555788ac7f31af1 SHA256 a896154cbcae99acdcfa5daae9b4a2f8dc5b6cccfd3aa20e9f0d9056cda459f3 +AUX vzctl-3.0.23-cronjobs-issue-warning.patch 1754 RMD160 0edc43b16922c975270c79b955e0c9d4e3aacec8 SHA1 b653c70f67681b6f0349a232b411a144cc214d2a SHA256 22f87a84e1a044766935745ec74967ca0490bc1a64a33fa64f5a3397db063c95 +AUX vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch 1427 RMD160 f486917985c78e066b5c5c371059d2d430be742c SHA1 996e86fd1819930ef749010240482dcf83cedf43 SHA256 59d9b1a3b0617194b8cbf90a7545e2a03dbea2368a28e646dc246ff567160c23 +AUX vzctl-3.0.23-cronjobs-wightspace.patch 1774 RMD160 c608bb1916d219c1f0701e70f631db3868eebc97 SHA1 a4048a1b28e8efc822ed2ddc98f692128b7faf7f SHA256 aa1f41aca441570711fe62c4f6a3f7a0517ba69a8c64c653e4e38f36678a15d8 +AUX vzctl-3.0.23-debian-CT-ipv6-fix.patch 891 RMD160 5610360392dec91ce24bd810d70541ae81f21bb1 SHA1 bad520de9e46491c2eebeb765a9719618ee35b12 SHA256 c4cc9a343faccb322e62a0166f6bf01d2073c29c444e236eaf30439f5cd530ab +AUX vzctl-3.0.23-forwarding-issue-warning.patch 902 RMD160 17fd5c6d70acd9c8899bc0148a66dd5351c6428a SHA1 9b0fd5844f84537c81744d3ddfd85d8336f0a5c5 SHA256 2aaf9294ec640e31b741f9b3886ba1022706abbe5300b238eb0a54440c74b079 +AUX vzctl-3.0.23-multiple-cron-jobs.patch 1337 RMD160 402daa3ba45855763365cb0387c58892c98a4626 SHA1 d9512478786edbd1620322afc235d4d53b005e1f SHA256 b068abb8cc6a77d19d870740f5aea375114ed628422496b504df50a516eb3d0e +AUX vzctl-3.0.23-ppp-feature.patch 1648 RMD160 371662db2df2f9308a10a07469b00fc8a02f630e SHA1 40e4b653065fd4a904daeef7a746acdef21ad17e SHA256 e21c74505660d0a26b2803ce1bd86ac3c45d60f2d44a46327bf0fd4934699eaf +AUX vzctl-3.0.23-ve-unlimited.conf-sample.patch 6820 RMD160 22f36eb040cc0d7c4e5234202d5f6ac8e30dadfb SHA1 bec42c124cb4770aa68c798f8f1e1c9ce5adc40a SHA256 33727682809532feb195249f655759468da05ef879d854c841de98e5cfa3b192 +AUX vzctl-3.0.23-vzarp-on-ifup.patch 3404 RMD160 d08123addc176a5532bfd8b264b4e5470fd49b72 SHA1 39c7254e2e0e0800e3714eaadd9c8cb26e2508c7 SHA256 ddaed5b15ad397f29643fec51b0720b0bf1ca1fcb218613c05c9d115f46b6ce7 +AUX vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch 2773 RMD160 f808e49ad253124bb1edf32ff31773eb2f3026ab SHA1 59845fa8f10fcda7f2a390205858ccb032eaaf6b SHA256 2225bcf154ca629ce9ef5d390eed19b5fbdbee4b902e203cfca9854c951a3035 +AUX vzctl-3.0.24.1-vzpostup.patch 848 RMD160 bd62efb3f9c6273aa4de56f2829ccb7fb80225fe SHA1 9c8982d9ef4d19b5731842b71df888d4c9e159c0 SHA256 1572c444a1a13cb7a63915ecd0d46e37d8fceff30e4be7582a47aa505de61f51 +DIST vzctl-3.0.24.1.tar.bz2 399161 RMD160 6cbe312018e40f067ba4f5d492b41b98106689fb SHA1 43e6da25473b51ee4ca1971d9347d66a7feb1ec2 SHA256 f0ff98e7ed4871d9435bbabfd2c8c6e23710fab43ec1827f246fd80d586e6fab +EBUILD vzctl-3.0.24.1.ebuild 2830 RMD160 f1a35da51f9ac9aeddb21ab14dc42277d2ca8643 SHA1 a0bf24105ab0dabb0905d0ecb4b710ad02b07d3c SHA256 e119986e6f0d9f49bc7af97ba8e748f8a2a3763c68d92ed54cc1d02432a080a1 +MISC ChangeLog 14648 RMD160 fc29a22bd173d06a04acd02cd979cce89f09dab2 SHA1 588c6237e8d9f8d30fe917ffd5db5e7be457fc5c SHA256 f093194743f7a50892b8a3be498742c4e0053dd266b143bf3dd98acd406cc506 +MISC metadata.xml 250 RMD160 859a9aa257ba731f151779434edc614d186d86cf SHA1 0e65923b7b0996ac7e063048e2fe5814453407b7 SHA256 70752023c9e02de0ce3540c4c09bc3256c72568be427bb5c7e9886745b5d2215 diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-UBC-parameter-swappages.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-UBC-parameter-swappages.patch new file mode 100644 index 0000000..6d89cba --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-UBC-parameter-swappages.patch @@ -0,0 +1,170 @@ +From: Igor Sukhih <igor@openvz.org> +Date: Tue, 10 Feb 2009 16:45:49 +0000 (+0300) +Subject: Added new UBC parameter: swappages +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=6b819fb60634a109200b7a749aa40d595fcd4895 + +Added new UBC parameter: swappages + +[kir@openvz.org: man page modifications] +--- + +diff --git a/include/ub.h b/include/ub.h +index 35868aa..e6f0bf3 100644 +--- a/include/ub.h ++++ b/include/ub.h +@@ -97,6 +97,9 @@ + #ifndef UB_IPTENTRIES + #define UB_IPTENTRIES 23 /* Number of iptables rules */ + #endif ++#ifndef UB_SWAPPAGES ++#define UB_SWAPPAGES 24 ++#endif + #define UB_DUMMY 255 + + /** Data structure for UBC parameter. +@@ -130,6 +133,7 @@ struct ub_struct { + unsigned long *dcachesize; + unsigned long *numiptent; + unsigned long *avnumproc; ++ unsigned long *swappages; + }; + typedef struct ub_struct ub_param; + +diff --git a/include/vzctl_param.h b/include/vzctl_param.h +index 83919e8..afb8898 100644 +--- a/include/vzctl_param.h ++++ b/include/vzctl_param.h +@@ -134,6 +134,7 @@ + #define PARAM_NETIF_MAC_FILTER 360 + #define PARAM_NETIF_BRIDGE 361 + #define PARAM_DESCRIPTION 362 ++#define PARAM_SWAPPAGES 363 + + #define PARAM_LINE "e:p:f:t:i:l:k:a:b:n:x:h" + #endif +diff --git a/man/vzctl.8 b/man/vzctl.8 +index 92d49e3..01c9d59 100644 +--- a/man/vzctl.8 ++++ b/man/vzctl.8 +@@ -315,6 +315,15 @@ This is currently an accounting-only parameter. It shows the usage of RAM + by this container. Barrier should be set to 0, and limit should be set to + \fBunlimited\fR. + .TP ++\fB--swappages\fR \fIpages\fR[:\fIpages\fR] ++The limit, if set, is used to show a total amount of swap space available ++inside the container. The barrier of this parameter is currently ignored. ++The default value is \fBunlimited\fR, meaning total swap will be reported ++as 0. ++ ++Note that in order for the value to be shown as total swap space, ++\fB--meminfo\fR parameter should be set to value other than \fBnone\fR. ++.TP + \fBCPU fair scheduler parameters\fR + + These parameters control CPU usage by container. +@@ -345,7 +354,8 @@ This parameter control output of /proc/meminfo inside a container + No /proc/meminfo virtualization (the same as on host system). + .IP "\fB--meminfo\fR \fImode\fR:\fIvalue\fR" + Configure total memory output in a container. Reported free memory is evaluated +-accordingly to the mode being set. ++accordingly to the mode being set. Reported swap is evaluated ++according to the settings of \fB--swappages\fR parameter. + .br + You can use the following modes for \fImode\fR: + .br +diff --git a/src/lib/config.c b/src/lib/config.c +index bb8953f..a16fe54 100644 +--- a/src/lib/config.c ++++ b/src/lib/config.c +@@ -83,6 +83,7 @@ static vps_config config[] = { + {"NUMIPTENT", NULL, PARAM_NUMIPTENT}, + {"IPTENTRIES", "NUMIPTENT", -1}, + {"AVNUMPROC", NULL, PARAM_AVNUMPROC}, ++{"SWAPPAGES", NULL, PARAM_SWAPPAGES}, + /* Capability */ + {"CAPABILITY", NULL, PARAM_CAP}, + /* Network */ +@@ -163,6 +164,7 @@ static struct option set_opt[] = { + {"dcachesize", required_argument, NULL, PARAM_DCACHESIZE}, + {"numiptent", required_argument, NULL, PARAM_NUMIPTENT}, + {"avnumproc", required_argument, NULL, PARAM_AVNUMPROC}, ++{"swappages", required_argument, NULL, PARAM_SWAPPAGES}, + /* Capability */ + {"capability", required_argument, NULL, PARAM_CAP}, + /* Network */ +@@ -685,6 +687,7 @@ if (ub->res != NULL) { \ + ADD_UB_PARAM(dcachesize, PARAM_DCACHESIZE) + ADD_UB_PARAM(numiptent, PARAM_NUMIPTENT) + ADD_UB_PARAM(avnumproc, PARAM_AVNUMPROC) ++ ADD_UB_PARAM(swappages, PARAM_SWAPPAGES) + #undef ADD_UB_PARAM + + return 0; +@@ -1933,6 +1936,7 @@ static int parse(envid_t veid, vps_param *vps_p, char *val, int id) + case PARAM_PHYSPAGES: + case PARAM_VMGUARPAGES: + case PARAM_OOMGUARPAGES: ++ case PARAM_SWAPPAGES: + ret = parse_ub(vps_p, val, id, _page_size); + break; + case PARAM_NUMPROC: +diff --git a/src/lib/ub.c b/src/lib/ub.c +index a50a1dc..f25522f 100644 +--- a/src/lib/ub.c ++++ b/src/lib/ub.c +@@ -61,6 +61,7 @@ static struct ubname2id { + {"DCACHESIZE", PARAM_DCACHESIZE}, + {"NUMIPTENT", PARAM_NUMIPTENT}, + {"AVNUMPROC", PARAM_AVNUMPROC}, ++ {"SWAPPAGES", PARAM_SWAPPAGES}, + {NULL, 0}, + }; + +@@ -128,6 +129,7 @@ inline static int is_ub_empty(ub_param *ub) + CHECK_UB(numfile) + CHECK_UB(dcachesize) + CHECK_UB(numiptent) ++ CHECK_UB(swappages) + #undef CHECK_UB + + return 1; +@@ -185,6 +187,16 @@ if (ub->name != NULL) { \ + SET_UB_LIMIT(numfile, UB_NUMFILE) + SET_UB_LIMIT(dcachesize, UB_DCACHESIZE) + SET_UB_LIMIT(numiptent, UB_IPTENTRIES) ++ if (ub->swappages && ++ setublimit(veid, UB_SWAPPAGES, ub->swappages) == -1) ++ { ++ if (errno == EINVAL) { ++ logger(-1, ENOSYS, "failed to set swappages"); ++ } else { ++ logger(-1, errno, "failed to set swappages"); ++ return VZ_SETUBC_ERROR; ++ } ++ } + #undef SET_UB_LIMIT + + return 0; +@@ -327,6 +339,7 @@ if ((src->x) != NULL) { \ + MERGE_P2(dcachesize) + MERGE_P2(numiptent) + MERGE_P2(avnumproc) ++ MERGE_P2(swappages) + #undef MERGE_P2 + } + +diff --git a/src/vzctl.c b/src/vzctl.c +index 448b83a..58715ae 100644 +--- a/src/vzctl.c ++++ b/src/vzctl.c +@@ -91,7 +91,9 @@ void usage(int rc) + " --oomguarpages P[:P] --lockedpages P[:P] --privvmpages P[:P]\n" + " --shmpages P[:P] --numfile N[:N] --numflock N[:N]\n" + " --numpty N[:N] --numsiginfo N[:N] --dcachesize N[:N]\n" +-" --numiptent N[:N] --physpages P[:P] --avnumproc N[:N]\n"); ++" --numiptent N[:N] --physpages P[:P] --avnumproc N[:N]\n" ++" --swappages P[:P]\n" ++); + memset(&mod, 0, sizeof(mod)); + set_log_level(0); + init_modules(&mod, NULL); diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch new file mode 100644 index 0000000..48ea502 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-dstdir-check.patch @@ -0,0 +1,61 @@ +From: Kir Kolyshkin <kir@openvz.org> +Date: Tue, 31 Mar 2009 12:05:53 +0000 (+0400) +Subject: etc/init.d/vz*: check for DST_CRONSCRIPT_DIR +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=d4d3bca4052daaf265946159a71fc9ed16c33cb8 + +etc/init.d/vz*: check for DST_CRONSCRIPT_DIR + +Before commits df09d4ed and 00a5a95c we used 'install' to put the cronscript +into DST_CRONSCRIPT_DIR (/etc/cron.d), and it was making sure that DST +dir existed. + +Since we're now using 'cat' not 'install' we have to check for DST directory +explicitly. More to say, if there's no /etc/cron.d/ than there's probably +no sense to create it (crond is missing or smth). So just silently exit. + +Should fix http://bugzilla.openvz.org/1078 + +Reported-by: Peter Volkov <pva@gentoo.org> +Signed-off-by: Kir Kolyshkin <kir@openvz.org> +--- + +diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in +index b1a1a59..8836768 100755 +--- a/etc/init.d/vz-gentoo.in ++++ b/etc/init.d/vz-gentoo.in +@@ -58,6 +58,7 @@ setup_cron() + { + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return ++ [ -d "$DST_CRONSCRIPT_DIR" ] || return + cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz && + chmod 644 $DST_CRONSCRIPT_DIR/vz + } +@@ -66,6 +67,7 @@ remove_cron() + { + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return ++ [ -d "$DST_CRONSCRIPT_DIR" ] || return + cat > $DST_CRONSCRIPT_DIR/vz <<EOF + # DO NOT EDIT THIS FILE! + # +diff --git a/etc/init.d/vz-redhat.in b/etc/init.d/vz-redhat.in +index a75c2b3..7733389 100755 +--- a/etc/init.d/vz-redhat.in ++++ b/etc/init.d/vz-redhat.in +@@ -129,6 +129,7 @@ setup_cron() + check_old_cron_files + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return ++ [ -d "$DST_CRONSCRIPT_DIR" ] || return + cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz && + chmod 644 $DST_CRONSCRIPT_DIR/vz + } +@@ -138,6 +139,7 @@ remove_cron() + check_old_cron_files + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return ++ [ -d "$DST_CRONSCRIPT_DIR" ] || return + cat > $DST_CRONSCRIPT_DIR/vz <<EOF + # DO NOT EDIT THIS FILE! + # diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-issue-warning.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-issue-warning.patch new file mode 100644 index 0000000..6bebd48 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-issue-warning.patch @@ -0,0 +1,41 @@ +commit f576ed041ccd50b1e87e0adf4a0774c2de6a5264 +Author: Peter Volkov <pva@gentoo.org> +Date: Sun Apr 5 21:51:01 2009 +0400 + + Issue warning if cronjobs aren't automatically set + + Init script is supposed to set cronjobs automatically on start and remove + them on stop. This works only with cron daemons that may hook at runtime + scripts at ${DST_CRONSCRIPT_DIR} (e.g. sys-process/vixie-cron can). For + other cron daemons it's safer to warn users and ask them to set cronjobs + manually. + +diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in +index 8836768..465fab2 100755 +--- a/etc/init.d/vz-gentoo.in ++++ b/etc/init.d/vz-gentoo.in +@@ -58,7 +58,23 @@ setup_cron() + { + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return +- [ -d "$DST_CRONSCRIPT_DIR" ] || return ++ if [ ! -d "${DST_CRONSCRIPT_DIR}" ]; then ++ if [ "x${SKIP_CRON_WARNINGS}" != "xyes" ]; then ++ ewarn "Automatic setup of cron jobs works only if a system cron daemon can use" ++ ewarn "\${DST_CRONSCRIPT_DIR} (${DST_CRONSCRIPT_DIR}) as a spool directory" ++ ewarn "(e.g. sys-process/vixie-cron can). On your system ${DST_CRONSCRIPT_DIR}" ++ ewarn "is not a directory even, thus you need manually set the following cron jobs:" ++ echo ++ grep -E -v '(^#|^$)' ${SRC_CRONSCRIPT_DIR}/vz* ++ echo ++ ewarn "Alternatevely, please, set cron execution of scripts inside ${SRC_CRONSCRIPT_DIR}" ++ ewarn "so that modifications in those scripts be handled automatically." ++ ewarn ++ ewarn "If you already did that and wish to avoid this warning message put" ++ ewarn "SKIP_CRON_WARNINGS=yes into /etc/conf.d/vz." ++ fi ++ return ++ fi + cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz && + chmod 644 $DST_CRONSCRIPT_DIR/vz + } diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch new file mode 100644 index 0000000..95f90e7 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-multiple-cron-jobs.patch @@ -0,0 +1,44 @@ +From: Kir Kolyshkin <kir@openvz.org> +Date: Tue, 31 Mar 2009 12:02:45 +0000 (+0400) +Subject: etc/init.d/vz-gentoo: add processing of multiple cron files +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=df09d4ede93d20ed755f0d97778be359182fbcc7 + +etc/init.d/vz-gentoo: add processing of multiple cron files + +This is an addition to commit 00a5a95c02c05e0070a1dd10b47c90b3715c9ff5 +for gentoo initscript. The idea is to be able to have multiple cronjob +files managed by initscript. + +The only problem is there's no update_cron task for Gentoo initscript. + +http://bugzilla.openvz.org/599 + +Signed-off-by: Kir Kolyshkin <kir@openvz.org> +--- + +diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in +index 5050005..b1a1a59 100755 +--- a/etc/init.d/vz-gentoo.in ++++ b/etc/init.d/vz-gentoo.in +@@ -58,8 +58,8 @@ setup_cron() + { + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return +- install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \ +- $DST_CRONSCRIPT_DIR ++ cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz && ++ chmod 644 $DST_CRONSCRIPT_DIR/vz + } + + remove_cron() +@@ -70,8 +70,8 @@ remove_cron() + # DO NOT EDIT THIS FILE! + # + # Contents of this file managed by /etc/init.d/vz script +-# Master copy is $SRC_CRONSCRIPT_DIR/vz. +-# Consult that file for documentation. ++# Master copy is in $SRC_CRONSCRIPT_DIR/vz* file(s). ++# Consult $SRC_CRONSCRIPT_DIR/vz* for documentation. + EOF + } + diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch new file mode 100644 index 0000000..874b647 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-cronjobs-wightspace.patch @@ -0,0 +1,55 @@ +From: Kir Kolyshkin <kir@openvz.org> +Date: Tue, 31 Mar 2009 11:39:17 +0000 (+0400) +Subject: etc/init.d/*: whitespace fixes +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=b9be63ff5a33955ce80384523b4712b0b032d4b4 + +etc/init.d/*: whitespace fixes + +As per http://bugzilla.openvz.org/1078 + +Reported-by: Peter Volkov <pva@gentoo.org> +Signed-off-by: Kir Kolyshkin <kir@openvz.org> +--- + +diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in +index 005813f..5050005 100755 +--- a/etc/init.d/vz-gentoo.in ++++ b/etc/init.d/vz-gentoo.in +@@ -56,17 +56,17 @@ check_config() { + # being enabled or not. + setup_cron() + { +- [ -z "$SRC_CRONSCRIPT_DIR" ] && return +- [ -d "$SRC_CRONSCRIPT_DIR" ] || return +- install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \ +- $DST_CRONSCRIPT_DIR ++ [ -z "$SRC_CRONSCRIPT_DIR" ] && return ++ [ -d "$SRC_CRONSCRIPT_DIR" ] || return ++ install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \ ++ $DST_CRONSCRIPT_DIR + } + + remove_cron() + { +- [ -z "$SRC_CRONSCRIPT_DIR" ] && return +- [ -d "$SRC_CRONSCRIPT_DIR" ] || return +- cat > $DST_CRONSCRIPT_DIR/vz <<EOF ++ [ -z "$SRC_CRONSCRIPT_DIR" ] && return ++ [ -d "$SRC_CRONSCRIPT_DIR" ] || return ++ cat > $DST_CRONSCRIPT_DIR/vz <<EOF + # DO NOT EDIT THIS FILE! + # + # Contents of this file managed by /etc/init.d/vz script +diff --git a/etc/init.d/vz-redhat.in b/etc/init.d/vz-redhat.in +index f311190..a75c2b3 100755 +--- a/etc/init.d/vz-redhat.in ++++ b/etc/init.d/vz-redhat.in +@@ -70,7 +70,7 @@ if [ "${MODULES_DISABLED}" != "yes" ]; then + fi + IPT_MODULES="ip_tables ${IPTABLES} xt_tcpudp" + if [ "${IPV6}" = "yes" ]; then +- IPT_MODULES="${IPT_MODULES} ${IP6TABLES}" ++ IPT_MODULES="${IPT_MODULES} ${IP6TABLES}" + fi + VZFS_MODULES="simfs" + fi diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-debian-CT-ipv6-fix.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-debian-CT-ipv6-fix.patch new file mode 100644 index 0000000..eec864c --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-debian-CT-ipv6-fix.patch @@ -0,0 +1,24 @@ +From: mathgl <mathgl@freesurf.fr> +Date: Mon, 17 Nov 2008 18:27:19 +0000 (+0300) +Subject: Fix IPv6 configuration on a debian lenny container +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=9fe02f4a9a42d8d608c401d2508da01f2a07a13e + +Fix IPv6 configuration on a debian lenny container + +http://bugzilla.openvz.org/show_bug.cgi?id=824 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505792 +--- + +diff --git a/etc/dists/scripts/debian-add_ip.sh b/etc/dists/scripts/debian-add_ip.sh +index ca87137..b9bda3e 100755 +--- a/etc/dists/scripts/debian-add_ip.sh ++++ b/etc/dists/scripts/debian-add_ip.sh +@@ -79,7 +79,7 @@ iface ${VENET_DEV}:${ifnum} inet static + " >> ${CFGFILE}.bak + + else +- sed -i -e "s/netmask\ 128/netmask\ 128\n\tup ifconfig venet0 add ${ip}/" ${CFGFILE}.bak ++ sed -i -e "s/netmask\ 128/netmask\ 128\n\tup ifconfig venet0 add ${ip}\/0/" ${CFGFILE}.bak + fi + + } diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-forwarding-issue-warning.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-forwarding-issue-warning.patch new file mode 100644 index 0000000..8c93a51 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-forwarding-issue-warning.patch @@ -0,0 +1,25 @@ +commit 78ef67a523e7f2589e49a082376ee56ce1a5d76e +Author: Peter Volkov <pva@gentoo.org> +Date: Tue Mar 31 13:03:44 2009 +0400 + + Issue warning if forwarding is disabled + + In case forwarding is disabled let's warn user about that. This is + alternative solution for http://bugzilla.openvz.org/show_bug.cgi?id=1079 + +diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in +index dc87d41..7c57370 100755 +--- a/etc/init.d/vz-gentoo.in ++++ b/etc/init.d/vz-gentoo.in +@@ -128,6 +128,11 @@ start_net() { + ebegin "Configuring interface ${VZDEV}" + /sbin/sysctl -q -w net.ipv4.conf.${VZDEV}.send_redirects=0 + eend $? ++ ++ if [ "x$(/sbin/sysctl net.ipv4.ip_forward 2>/dev/null | awk '{print $3}')" = "x0" ]; then ++ ewarn "It looks like you have ip forwarding disabled. To make networking" ++ ewarn "available for containers, please, run sysctl -w net.ipv4.ip_forward=1" ++ fi + } + + stop_net() { diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch new file mode 100644 index 0000000..bf76b38 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-multiple-cron-jobs.patch @@ -0,0 +1,42 @@ +commit df09d4ede93d20ed755f0d97778be359182fbcc7 +Author: Kir Kolyshkin <kir@openvz.org> +Date: Tue Mar 31 16:02:45 2009 +0400 + + etc/init.d/vz-gentoo: add processing of multiple cron files + + This is an addition to commit 00a5a95c02c05e0070a1dd10b47c90b3715c9ff5 + for gentoo initscript. The idea is to be able to have multiple cronjob + files managed by initscript. + + The only problem is there's no update_cron task for Gentoo initscript. + + http://bugzilla.openvz.org/599 + + Signed-off-by: Kir Kolyshkin <kir@openvz.org> + +diff --git a/etc/init.d/vz-gentoo.in b/etc/init.d/vz-gentoo.in +index 5050005..b1a1a59 100755 +--- a/etc/init.d/vz-gentoo.in ++++ b/etc/init.d/vz-gentoo.in +@@ -58,8 +58,8 @@ setup_cron() + { + [ -z "$SRC_CRONSCRIPT_DIR" ] && return + [ -d "$SRC_CRONSCRIPT_DIR" ] || return +- install -m644 -o root -g root $SRC_CRONSCRIPT_DIR/vz \ +- $DST_CRONSCRIPT_DIR ++ cat $SRC_CRONSCRIPT_DIR/vz* > $DST_CRONSCRIPT_DIR/vz && ++ chmod 644 $DST_CRONSCRIPT_DIR/vz + } + + remove_cron() +@@ -70,8 +70,8 @@ remove_cron() + # DO NOT EDIT THIS FILE! + # + # Contents of this file managed by /etc/init.d/vz script +-# Master copy is $SRC_CRONSCRIPT_DIR/vz. +-# Consult that file for documentation. ++# Master copy is in $SRC_CRONSCRIPT_DIR/vz* file(s). ++# Consult $SRC_CRONSCRIPT_DIR/vz* for documentation. + EOF + } + diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-ppp-feature.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-ppp-feature.patch new file mode 100644 index 0000000..9eab5d0 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-ppp-feature.patch @@ -0,0 +1,49 @@ +From: Cyrill Gorcunov <gorcunov@openvz.org> +Date: Tue, 3 Feb 2009 19:45:36 +0000 (+0300) +Subject: Introduce new "ppp" feature +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=d78a7653d983269553763d536f69de0bb5109353 + +Introduce new "ppp" feature + +Allow an user to turn "ppp" feature on and off. + +Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org> +--- + +diff --git a/include/linux/vzcalluser.h b/include/linux/vzcalluser.h +index 045a0e1..66d61cd 100644 +--- a/include/linux/vzcalluser.h ++++ b/include/linux/vzcalluser.h +@@ -202,6 +202,7 @@ struct env_create_param3 { + #define VE_FEATURE_DEF_PERMS (1ULL << 2) + #define VE_FEATURE_SIT (1ULL << 3) + #define VE_FEATURE_IPIP (1ULL << 4) ++#define VE_FEATURE_PPP (1ULL << 5) + + #define VE_FEATURES_OLD (VE_FEATURE_SYSFS) + #define VE_FEATURES_DEF (VE_FEATURE_SYSFS | \ +diff --git a/man/vzctl.8 b/man/vzctl.8 +index 85d3b0d..92d49e3 100644 +--- a/man/vzctl.8 ++++ b/man/vzctl.8 +@@ -446,7 +446,7 @@ designated by its \fImajor\fR and \fIminor\fR numbers. Device file have to be cr + .TP + \fB--features\fR \fIname\fR:\fBon|off\fR + Enable or disable a specific container feature. +-Known features are: \fIsysfs\fR, \fInfs\fR, \fIsit\fR, \fIipip\fR. ++Known features are: \fIsysfs\fR, \fInfs\fR, \fIsit\fR, \fIipip\fR, \fIppp\fR. + .TP + \fBApply config\fR + .TP +diff --git a/src/lib/vzfeatures.c b/src/lib/vzfeatures.c +index 2f5596a..c6af929 100644 +--- a/src/lib/vzfeatures.c ++++ b/src/lib/vzfeatures.c +@@ -27,6 +27,7 @@ static struct feature_s features[] = { + { "nfs", 0, VE_FEATURE_NFS }, + { "sit", 0, VE_FEATURE_SIT}, + { "ipip", 0, VE_FEATURE_IPIP}, ++ { "ppp", 0, VE_FEATURE_PPP}, + { NULL} + }; + diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-ve-unlimited.conf-sample.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-ve-unlimited.conf-sample.patch new file mode 100644 index 0000000..d3c803e --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-ve-unlimited.conf-sample.patch @@ -0,0 +1,205 @@ +From: Peter Volkov <pva@gentoo.org> +Date: Sun, 30 Nov 2008 13:48:39 +0000 (+0300) +Subject: Added unlimited CT config +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=c8dc6e5a60137eafca882c39ffbeb0177e65a064 + +Added unlimited CT config + +This implements (again thank Daniel Robbins for suggestion and initial +work) ve-unlimited.conf-sample configuration file. It sets CT resources +to unlimited values. Not to repeating his reasoning I cite him here: + +"I think that adding this to the /etc/vz/conf directory would be a big +step forward. I think that OpenVZ is going to be used more and more for +single-developer workstations where developers want to use containers to +create test environments. In these single-user situations, resource limits +just get in the way." + +I tend to aggree. If you just want to use containers like very smart +chroots resource limits just make things harder. +--- + +diff --git a/etc/conf/Makefile.am b/etc/conf/Makefile.am +index 963abdc..52c16e8 100644 +--- a/etc/conf/Makefile.am ++++ b/etc/conf/Makefile.am +@@ -18,7 +18,7 @@ + include $(top_srcdir)/paths.am + + VE0CONFIG = 0.conf +-VECONFIG = ve-light.conf-sample ve-vps.basic.conf-sample ++VECONFIG = ve-light.conf-sample ve-vps.basic.conf-sample ve-unlimited.conf-sample + + if ARCH_IA64 + VECONFIG_EXT = .ia64 +diff --git a/etc/conf/ve-unlimited.conf-sample b/etc/conf/ve-unlimited.conf-sample +new file mode 100644 +index 0000000..2b9febd +--- /dev/null ++++ b/etc/conf/ve-unlimited.conf-sample +@@ -0,0 +1,51 @@ ++# Copyright (C) 2000-2008, Parallels, Inc. All rights reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# ++ ++VERSION="2" ++ ++ONBOOT="no" ++ ++# UBC parameters (in form of barrier:limit) ++# Primary parameters ++AVNUMPROC="unlimited" ++NUMPROC="unlimited" ++NUMTCPSOCK="419430" ++NUMOTHERSOCK="419430" ++VMGUARPAGES="unlimited" ++# Secondary parameters ++KMEMSIZE="unlimited" ++#TCPSNDBUF="2147483647:2147483647" ++TCPSNDBUF="1073741823:2147483647" ++TCPRCVBUF="1073741823:2147483647" ++OTHERSOCKBUF="1073741823:2147483647" ++DGRAMRCVBUF="unlimited" ++OOMGUARPAGES="unlimited" ++# Auxiliary parameters ++LOCKEDPAGES="unlimited" ++SHMPAGES="unlimited" ++PRIVVMPAGES="unlimited" ++NUMFILE="unlimited" ++NUMFLOCK="unlimited" ++NUMPTY="unlimited" ++NUMSIGINFO="unlimited" ++DCACHESIZE="unlimited" ++ ++PHYSPAGES="0:unlimited" ++NUMIPTENT="unlimited" ++ ++# Disk quota parameters (in form of softlimit:hardlimit) ++DISK_QUOTA="no" +diff --git a/etc/conf/ve-unlimited.conf-sample.ia64 b/etc/conf/ve-unlimited.conf-sample.ia64 +new file mode 100644 +index 0000000..42fd7f6 +--- /dev/null ++++ b/etc/conf/ve-unlimited.conf-sample.ia64 +@@ -0,0 +1,51 @@ ++# Copyright (C) 2000-2008, Parallels, Inc. All rights reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# ++ ++VERSION="2" ++ ++ONBOOT="no" ++ ++# UBC parameters (in form of barrier:limit) ++# Primary parameters ++AVNUMPROC="unlimited" ++NUMPROC="unlimited" ++NUMTCPSOCK="1801439850948198" ++NUMOTHERSOCK="1801439850948198" ++VMGUARPAGES="unlimited" ++# Secondary parameters ++KMEMSIZE="unlimited" ++#TCPSNDBUF="2147483647:2147483647" ++TCPSNDBUF="4611686018427387903:9223372036854775807" ++TCPRCVBUF="4611686018427387903:9223372036854775807" ++OTHERSOCKBUF="4611686018427387903:9223372036854775807" ++DGRAMRCVBUF="unlimited" ++OOMGUARPAGES="unlimited" ++# Auxiliary parameters ++LOCKEDPAGES="unlimited" ++SHMPAGES="unlimited" ++PRIVVMPAGES="unlimited" ++NUMFILE="unlimited" ++NUMFLOCK="unlimited" ++NUMPTY="unlimited" ++NUMSIGINFO="unlimited" ++DCACHESIZE="unlimited" ++ ++PHYSPAGES="0:unlimited" ++NUMIPTENT="unlimited" ++ ++# Disk quota parameters (in form of softlimit:hardlimit) ++DISK_QUOTA="no" +diff --git a/etc/conf/ve-unlimited.conf-sample.x86_64 b/etc/conf/ve-unlimited.conf-sample.x86_64 +new file mode 100644 +index 0000000..42fd7f6 +--- /dev/null ++++ b/etc/conf/ve-unlimited.conf-sample.x86_64 +@@ -0,0 +1,51 @@ ++# Copyright (C) 2000-2008, Parallels, Inc. All rights reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# ++ ++VERSION="2" ++ ++ONBOOT="no" ++ ++# UBC parameters (in form of barrier:limit) ++# Primary parameters ++AVNUMPROC="unlimited" ++NUMPROC="unlimited" ++NUMTCPSOCK="1801439850948198" ++NUMOTHERSOCK="1801439850948198" ++VMGUARPAGES="unlimited" ++# Secondary parameters ++KMEMSIZE="unlimited" ++#TCPSNDBUF="2147483647:2147483647" ++TCPSNDBUF="4611686018427387903:9223372036854775807" ++TCPRCVBUF="4611686018427387903:9223372036854775807" ++OTHERSOCKBUF="4611686018427387903:9223372036854775807" ++DGRAMRCVBUF="unlimited" ++OOMGUARPAGES="unlimited" ++# Auxiliary parameters ++LOCKEDPAGES="unlimited" ++SHMPAGES="unlimited" ++PRIVVMPAGES="unlimited" ++NUMFILE="unlimited" ++NUMFLOCK="unlimited" ++NUMPTY="unlimited" ++NUMSIGINFO="unlimited" ++DCACHESIZE="unlimited" ++ ++PHYSPAGES="0:unlimited" ++NUMIPTENT="unlimited" ++ ++# Disk quota parameters (in form of softlimit:hardlimit) ++DISK_QUOTA="no" diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-vzarp-on-ifup.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-vzarp-on-ifup.patch new file mode 100644 index 0000000..a0d020d --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-vzarp-on-ifup.patch @@ -0,0 +1,122 @@ +http://556.bugzilla.openvz.org/attachment.cgi?id=829 + +We need to test this patch. Hey, anybody? + +diff --git a/Makefile.am b/Makefile.am +index 3b67cd8..ae05b3b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -53,6 +53,7 @@ DISTRO_TARGETS = \ + + $(DISTRO_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) -C etc $@ ++ $(MAKE) $(AM_MAKEFLAGS) -C scripts $@ + + install-data-hook: + @echo +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index a2bde7e..85ea8fd 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -22,7 +22,8 @@ vzlib_SCRIPTS = \ + vps-functions \ + vps-net_add \ + vps-net_del \ +- vps-stop ++ vps-stop \ ++ ifup-vz-arp + + vzcron_SCRIPTS = \ + vpsnetclean \ +@@ -35,3 +36,36 @@ EXTRA_DIST = \ + CLEANFILES = \ + $(vzlib_SCRIPTS) \ + $(vzcron_SCRIPTS) ++ ++# FIXME: what to do in case DESTDIR is set? I guess nothing... ++install-redhat: ++ if [ ! -e /sbin/ifup-local ]; then \ ++ ln -sf @PKGLIBDIR@/scripts/ifup-vz-arp /sbin/ifup-local; \ ++ else \ ++ @echo; \ ++ @echo " ***************************************************"; \ ++ @echo " WARNING: /sbin/ifup-local is present!"; \ ++ @echo " You have to manually edit /sbin/ifup-local so that "; \ ++ @echo " @PKGLIBDIR@/scripts/ifup-vz-arp"; \ ++ @echo " is called from it."; \ ++ @echo " ***************************************************"; \ ++ @echo; \ ++ fi ++ ++ ++install-suse: ++ ln -sf @PKGLIBDIR@/scripts/ifup-vz-arp /etc/sysconfig/network/if-up.d/ ++ ++install-debian: ++ ln -sf @PKGLIBDIR@/scripts/ifup-vz-arp /etc/network/if-up.d/ ++ ++install-gentoo: ++ @echo ++ @echo " ***************************************************" ++ @echo " Please add the following code to /etc/conf.d/net:" ++ @echo ++ @echo "postup() {" ++ @echo " @PKGLIBDIR@/scripts/ifup-vz-arp" '"${IFACE}"' ++ @echo "}" ++ @echo " ***************************************************" ++ @echo +diff --git a/scripts/ifup-vz-arp.in b/scripts/ifup-vz-arp.in +new file mode 100755 +index 0000000..7e2346b +--- /dev/null ++++ b/scripts/ifup-vz-arp.in +@@ -0,0 +1,25 @@ ++#!/bin/bash ++# Copyright (C) 2008, Parallels, Inc. All rights reserved. ++# ++# Update ARP table for all containers on interface up ++ ++[ ! -f /proc/vz/veinfo ] && exit 0 ++ ++test -f @PKGLIBDIR@/scripts/vps-functions || exit 1 ++test -f @PKGCONFDIR@/vz.conf || exit 1 ++. @PKGLIBDIR@/scripts/vps-functions ++. @PKGCONFDIR@/vz.conf ++ ++update_arp() ++{ ++ local veip ++ for veip in $(awk '!/^Version/ { print $1 }' /proc/vz/veip); do ++ vzarp add ${veip} ++ done ++} ++ ++DEV=$1 ++[ -z "${DEV}" ] && exit 0 ++NETDEVICES="${DEV}" ++update_arp ++exit 0 +diff --git a/vzctl.spec b/vzctl.spec +index ae3ed8c..adc6702 100644 +--- a/vzctl.spec ++++ b/vzctl.spec +@@ -108,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT + %attr(755,root,root) %{_sbindir}/vzmigrate + %attr(755,root,root) %{_scriptdir}/vpsreboot + %attr(755,root,root) %{_scriptdir}/vpsnetclean ++%attr(755,root,root) %{_scriptdir}/ifup-vz-arp + %attr(644,root,root) %{_logrdir}/vzctl + %attr(644,root,root) %{_distconfdir}/distribution.conf-template + %attr(644,root,root) %{_distconfdir}/default +@@ -161,6 +162,11 @@ if [ -f /etc/SuSE-release ]; then + for file in ${NET_CFG}; do + ln -sf /etc/sysconfig/network-scripts/${file} /etc/sysconfig/network/scripts/${file} + done ++ ln -sf /usr/share/vzctl/scripts/ifup-vz-arp /etc/sysconfig/network/if-up.d/ifup-arp ++else # RedHat/Fedora/CentOS case ++ if [ ! -e /sbin/ifup-local ]; then ++ ln -sf /usr/share/vzctl/scripts/ifup-vz-arp /sbin/ifup-local ++ fi + fi + + %preun diff --git a/sys-cluster/vzctl/files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch b/sys-cluster/vzctl/files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch new file mode 100644 index 0000000..b8361e4 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.23-vznetaddbr.in-no-bashisms.patch @@ -0,0 +1,92 @@ +From: Dmitry V. Levin <ldv@altlinux.org> +Date: Fri, 31 Oct 2008 11:54:47 +0000 (+0000) +Subject: vznetaddbr.in: Rewrite without bash-isms and ifconfig +X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff_plain;h=93ef4d978a8c609cc04c53f39bc4fe674a089811 + +vznetaddbr.in: Rewrite without bash-isms and ifconfig + +Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> +--- + +diff --git a/bin/vznetaddbr.in b/bin/vznetaddbr.in +index eb2ba70..e8599e9 100755 +--- a/bin/vznetaddbr.in ++++ b/bin/vznetaddbr.in +@@ -1,53 +1,39 @@ +-#!/bin/bash ++#!/bin/sh + # + # Add virtual network interfaces (veth's) in a container to a bridge on CT0 + + CONFIGFILE=@PKGCONFDIR@/conf/$VEID.conf + . $CONFIGFILE + +-NETIFLIST=$(echo $NETIF | sed 's/;/\n/g') ++NETIFLIST=$(printf %s "$NETIF" |tr ';' '\n') + +-if [ ! -n "$NETIFLIST" ]; then +- echo "According to $CONFIGFILE, CT$VEID has no veth interface configured." ++if [ -z "$NETIFLIST" ]; then ++ echo >&2 "According to $CONFIGFILE, CT$VEID has no veth interface configured." + exit 1 + fi + +-IFACES=$(echo $NETIFLIST | sed 's/;/\n/g') +-for tmp in $IFACES; do +- CTIFNAME= +- CTBRIDGE= +- VZHOSTIF= +- +- NETIF_OPTIONS=$(echo $tmp | sed 's/,/\n/g') +- for str in $NETIF_OPTIONS; do +- # getting 'ifname' parameter value +- if [[ "$str" =~ ^ifname= ]]; then +- # remove the parameter name from the string (along with '=') +- CTIFNAME=${str#*=} +- fi +- if [[ "$str" =~ ^bridge= ]]; then +- # remove the parameter name from the string (along with '=') +- CTBRIDGE=${str#*=} +- fi +- # getting 'host_ifname' parameter value +- if [[ "$str" =~ ^host_ifname= ]]; then +- # remove the parameter name from the string (along with '=') +- VZHOSTIF=${str#*=} +- fi ++for iface in $NETIFLIST; do ++ bridge= ++ host_ifname= ++ ++ for str in $(printf %s "$iface" |tr ',' '\n'); do ++ case "$str" in ++ bridge=*|host_ifname=*) ++ eval "${str%%=*}=\${str#*=}" ;; ++ esac + done + +- if [ "$VZHOSTIF" != "$3" ]; then +- continue +- fi +- if [ ! -n "$CTBRIDGE" ]; then +- CTBRIDGE=vmbr0 +- fi +- +- echo "Adding interface $VZHOSTIF to bridge $CTBRIDGE on CT0 for CT$VEID" +- /sbin/ifconfig $VZHOSTIF 0 +- echo 1 > /proc/sys/net/ipv4/conf/$VZHOSTIF/proxy_arp +- echo 1 > /proc/sys/net/ipv4/conf/$VZHOSTIF/forwarding +- /usr/sbin/brctl addif $CTBRIDGE $VZHOSTIF ++ [ "$host_ifname" = "$3" ] || ++ continue ++ ++ [ -n "$bridge" ] || ++ bridge=vmbr0 ++ ++ echo "Adding interface $host_ifname to bridge $bridge on CT0 for CT$VEID" ++ ip addr add 0 dev "$host_ifname" ++ echo 1 >"/proc/sys/net/ipv4/conf/$host_ifname/proxy_arp" ++ echo 1 >"/proc/sys/net/ipv4/conf/$host_ifname/forwarding" ++ brctl addif "$bridge" "$host_ifname" + + break + done diff --git a/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch b/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch new file mode 100644 index 0000000..1a98fe5 --- /dev/null +++ b/sys-cluster/vzctl/files/vzctl-3.0.24.1-vzpostup.patch @@ -0,0 +1,30 @@ +From 05b5befcbac2d907e6a7b317895bfbbeef74443d Mon Sep 17 00:00:00 2001 +From: Peter Volkov <pva@gentoo.org> +Date: Thu, 22 Jul 2010 18:30:38 +0400 +Subject: [PATCH] vzifup-post: fix device for proxy arp + +We need to del/add routing to detect correct device for proxy arp in +NEIGHBOUR_DEVS=detect mode. + +http://bugzilla.openvz.org/show_bug.cgi?id=1587 +--- + bin/vzifup-post.in | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/bin/vzifup-post.in b/bin/vzifup-post.in +index bba7d11..2979907 100755 +--- a/bin/vzifup-post.in ++++ b/bin/vzifup-post.in +@@ -24,7 +24,9 @@ update_arp() + { + local veip + for veip in $(awk '!/^Version/ { print $1 }' /proc/vz/veip); do ++ [ "$NEIGHBOUR_DEVS" != 'detect' ] && vzdelrouting "${veip}" + vzarp add ${veip} ++ [ "$NEIGHBOUR_DEVS" != 'detect' ] && vzaddrouting "${veip}" + done + } + +-- +1.7.1 + diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml new file mode 100644 index 0000000..1301c98 --- /dev/null +++ b/sys-cluster/vzctl/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>vserver</herd> + <maintainer> + <email>pva@gentoo.org</email> + <name>Peter Volkov</name> + </maintainer> +</pkgmetadata> diff --git a/sys-cluster/vzctl/vzctl-3.0.24.1.ebuild b/sys-cluster/vzctl/vzctl-3.0.24.1.ebuild new file mode 100644 index 0000000..b22c3b5 --- /dev/null +++ b/sys-cluster/vzctl/vzctl-3.0.24.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.24.ebuild,v 1.2 2010/07/02 15:11:05 pva Exp $ + +EAPI="2" + +inherit bash-completion 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="bash-completion" + +RDEPEND=" + net-firewall/iptables + sys-apps/ed + sys-apps/iproute2 + sys-fs/vzquota + virtual/cron" + +DEPEND="${RDEPEND}" + +src_prepare() { + # Set default OSTEMPLATE on gentoo + sed -e 's:=redhat-:=gentoo-:' -i etc/dists/default || die + epatch "${FILESDIR}/${P}-vzpostup.patch" +} + +src_configure() { + econf \ + --localstatedir=/var \ + --enable-cron \ + --enable-udev \ + $(use_enable bash-completion bashcomp) \ + --enable-logrotate +} + +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 + local conf_without_OSTEMPLATE + for file in \ + $(find "${ROOT}/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 " }" + + elog "NOTE: Starting with vzctl-3.0.22 the mechanism for choosing the" + elog "interfaces to send ARP requests to has been improved (see description" + elog "of NEIGHBOUR_DEVS in vz.conf(5) man page). In case CT IP addresses" + elog "are not on the same subnet as HN IPs, it may lead to such CTs being" + elog "unreachable from the outside world." + elog + elog "The solution is to set up a device route(s) for the network your CTs are" + elog "in. For more details, see http://bugzilla.openvz.org/show_bug.cgi?id=771#c1" + elog + elog "The old vzctl behavior can be restored by setting NEIGHBOUR_DEVS to any" + elog 'value other than "detect" in /etc/vz/vz.conf.' +} |