Adding kir's recent patch to fix installation of vzctl-2.7.0.23

(Portage version: 2.0.53_rc6)

2 files changed, 167 insertions, 1 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index cf60bdcdceb9..c8f0fcbcd907 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.3 2005/10/21 17:26:53 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.4 2005/10/21 21:00:14 phreak Exp $
+
+  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)
 
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch b/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
index 3d8054e28c16..77174f08d58f 100644
--- a/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
+++ b/sys-cluster/vzctl/files/vzctl-2.7.0.23-gentoo_etc_vz.patch
@@ -105,6 +105,122 @@ diff -urN vzctl-2.7.0-23/man/vps.conf.5 vzctl-2.7.0-23_etc_vz/man/vps.conf.5
  is the ID of the given VPS.
  .PP
  Configuration file consists of lines in the form
+diff -urN vzctl-2.7.0-23/man/vps.conf.5.orig vzctl-2.7.0-23_etc_vz/man/vps.conf.5.orig
+--- vzctl-2.7.0-23/man/vps.conf.5.orig	1970-01-01 03:00:00.000000000 +0300
++++ vzctl-2.7.0-23_etc_vz/man/vps.conf.5.orig	2005-10-23 00:31:31.488693104 +0400
+@@ -0,0 +1,112 @@
++.\" $Id: vzctl-2.7.0.23-gentoo_etc_vz.patch,v 1.2 2005/10/21 21:00:14 phreak Exp $
++.TH vps.conf 5 "10 Aug 2005" "OpenVZ" "Virtual Private Server"
++.SH NAME
++vps.conf \- configuration file for a Virtual Private Server.
++.SH SYNOPSIS
++/etc/sysconfig/vz-scripts/XXX.conf
++.SH DESCRIPTION
++This is a configuration file for a VPS. It is stored as
++\fB/etc/sysconfig/vz-scripts/\fR\fIXXX\fB.conf\fR, where \fIXXX\fR
++is the ID of the given VPS.
++.PP
++Configuration file consists of lines in the form
++.PP
++\fBPARAMETER\fR="\fIvalue\fR"
++.PP
++All parameter names and values are case-sensitive. Quotes surrounding a
++\fIvalue\fR are required if value contains spaces, and are optional otherwise.
++Extra spaces are not allowed. All unrecognized lines will be ignored.
++.PP
++Please note that the file is created/modified by the \fBvzctl(8)\fR command with the \fIset --save\fR arguments, therefore changes to this file made otherwise than by \fBvzctl(8)\fR can be lost during the next \fBvzctl\fR run.
++.PP
++The meaning of each parameter is described in \fBvzctl(8)\fR, so here only
++the appropriate \fBvzctl set\fR option is given.
++.SS Miscellaneous parameters
++.IP \fBONBOOT\fR="\fByes\fR|\fBno\fR"
++Specifies whether this VPS will be started during system bootup.
++Default is \fBno\fR, meaning VPS will not be started
++if \fBONBOOT\fR parameter is omitted.
++Corresponds to the \fB--onboot\fR option.
++.IP \fBOSTEMPLATE\fR="\fItmpl_name\fR"
++Corresponds to the \fB--ostemplate\fR option.
++.IP \fBVE_ROOT\fR="\fIdirectory\fR"
++Corresponds to the \fB--root\fR option.
++.IP \fBVE_PRIVATE\fR="\fIdirectory\fR"
++Corresponds to the \fB--private\fR option.
++.IP \fBDISABLED\fR="\fByes\fR|\fBno\fR"
++Corresponds to the \fB--disabled\fR option.
++.IP \fBORIGIN_SAMPLE\fR="\fIname\fR"
++Name of VPS sample config VPS based on.
++.IP \fBCONFIG_CUSTOMIZED\fR="\fByes\fR|\fBno\fR"
++Set to \fByes\fR if VPS config was modified.
++.SS Resource management parameters
++.IP \fBNUMPROC\fR
++Corresponds to the \fB--numproc\fR options.
++.IP \fBNUMFILE\fR
++Corresponds to the \fB--numfile\fR options.
++.IP \fBNUMFLOCK\fR
++Corresponds to the \fB--numflock\fR options.
++.IP \fBNUMPTY\fR
++Corresponds to the \fB--numpty\fR options.
++.IP \fBNUMSIGINFO\fR
++Corresponds to the \fB--numsiginfo\fR options.
++.IP \fBNUMTCPSOCK\fR
++Corresponds to the \fB--numtcpsock\fR options.
++.IP \fBNUMOTHERSOCK\fR
++Corresponds to the \fB--numothersock\fR options.
++.IP \fBPRIVVMPAGES\fR
++Corresponds to the \fB--privvmpages\fR options.
++.IP \fBVMMGUARPAGES\fR
++Corresponds to the \fB--vmguarpages\fR options.
++.IP \fBOOMGUARPAGES\fR
++Corresponds to the \fB--oomguarpages\fR options.
++.IP \fBLOCKEDPAGES\fR
++Corresponds to the \fB--lockedpages\fR options.
++.IP \fBSHMPAGES\fR
++Corresponds to the \fB--shmpages\fR options.
++.IP \fBKMEMSIZE\fR
++Corresponds to the \fB--kmemsize\fR options.
++.IP \fBTCPSNDBUF\fR
++Corresponds to the \fB--tcpsndbuf\fR options.
++.IP \fBTCPRCVBUF\fR
++Corresponds to the \fB--tcprcvbuf\fR options.
++.IP \fBOTHERSOCKBUF\fR
++Corresponds to the \fB--othersockbuf\fR options.
++.IP \fBDGRAMRCVBUF\fR
++Corresponds to the \fB--dgramrcvbuf\fR options.
++.IP \fBDCACHESIZE\fR
++Corresponds to the \fB--dcachesize\fR options.
++.IP \fBNUMIPTENT\fR
++Corresponds to the \fB--numiptent\fR options.
++.IP \fBCPUUNITS\fR
++Corresponds to the \fB--cpuunits\fR option.
++.IP \fBDISKSPACE\fR="\fIsoftlimit\fR[:\fIhardlimit\fR]"
++Corresponds to the \fB--diskspace\fR parameter.
++.IP \fBDISKINODES\fR="\fIsoftlimit\fR[:\fIhardlimit\fR]"
++Corresponds to the \fB--diskinodes\fR parameter.
++.IP \fBQUOTATIME\fR="\fIseconds\fR"
++Corresponds to the \fB--quotatime\fR parameter.
++.IP \fBQUOTAUGIDLIMIT\fR="\fInum\fR"
++Corresponds to the \fB--quotaugidlimit\fR parameter.
++.IP \fBNOATIME\fR="\fByes\fR|\fBno\fR"
++Corresponds to the \fB--noatime\fR option.
++.IP \fBCAPABILITY\fR="\fIcapname\fR:\fBon\fR|\fBoff\fR\ [...]"
++Corresponds to the \fB--capability\fR option
++.SS Network related parameters
++.IP \fBIP_ADDRESS\fR="\fIaddress\ [address]\fR"
++Specifies the \fIaddress\fR the VPS will be assigned. Several addresses
++are divided by spaces.
++Corresponds to the \fB--ipadd\fR option.
++.IP \fBHOSTNAME\fR="\fIname\fR"
++Corresponds to the \fB--hostname\fR option.
++.IP \fBNAMESERVER\fR="\fIip\fR\ [\fIip\fR]"
++Corresponds to the \fB--nameserver\fR option. Several name server addresses
++are divided by spaces.
++.IP \fBSEARCHDOMAIN\fR="\fIdomain\fR\ [\fIdomain\fR]"
++Corresponds to the \fB--searchdomain\fR option. Several search domains
++are divided by spaces.
++.SH SEE ALSO
++.BR vzctl (8),
++.BR vz (5).
++.SH LICENSE
++Copyright (C) 2001-2005 by SWsoft.
 diff -urN vzctl-2.7.0-23/man/vzctl.8 vzctl-2.7.0-23_etc_vz/man/vzctl.8
 --- vzctl-2.7.0-23/man/vzctl.8	2005-10-23 00:30:51.062838768 +0400
 +++ vzctl-2.7.0-23_etc_vz/man/vzctl.8	2005-10-23 00:31:40.960253208 +0400
@@ -135,6 +251,18 @@ diff -urN vzctl-2.7.0-23/man/vzctl.8 vzctl-2.7.0-23_etc_vz/man/vzctl.8
  .br
  /proc/vz/veinfo
  .br
+diff -urN vzctl-2.7.0-23/man/vzctl.8.orig vzctl-2.7.0-23_etc_vz/man/vzctl.8.orig
+--- vzctl-2.7.0-23/man/vzctl.8.orig	2005-10-17 16:50:30.000000000 +0400
++++ vzctl-2.7.0-23_etc_vz/man/vzctl.8.orig	2005-10-23 00:31:31.488693104 +0400
+@@ -420,7 +420,7 @@
+ .SH FILES
+ .ad l
+ \f(CR
+-/etc/sysconfig/vz
++/etc/conf.d/vz
+ .br
+ /etc/sysconfig/vz-scripts/vpsid.conf
+ .br
 diff -urN vzctl-2.7.0-23/man/vzsplit.8 vzctl-2.7.0-23_etc_vz/man/vzsplit.8
 --- vzctl-2.7.0-23/man/vzsplit.8	2005-10-17 16:50:30.000000000 +0400
 +++ vzctl-2.7.0-23_etc_vz/man/vzsplit.8	2005-10-23 00:31:54.328220968 +0400
@@ -147,6 +275,40 @@ diff -urN vzctl-2.7.0-23/man/vzsplit.8 vzctl-2.7.0-23_etc_vz/man/vzsplit.8
  .TP
  \fB-s\fR \fIswapsize\fR
  Specify the swap size in Kbytes. If not provided in the option, the swap size will be read from /proc/meminfo.
+diff -urN vzctl-2.7.0-23/man/vzsplit.8.orig vzctl-2.7.0-23_etc_vz/man/vzsplit.8.orig
+--- vzctl-2.7.0-23/man/vzsplit.8.orig	1970-01-01 03:00:00.000000000 +0300
++++ vzctl-2.7.0-23_etc_vz/man/vzsplit.8.orig	2005-10-23 00:31:31.488693104 +0400
+@@ -0,0 +1,30 @@
++.\" $Id: vzctl-2.7.0.23-gentoo_etc_vz.patch,v 1.2 2005/10/21 21:00:14 phreak Exp $
++.TH vzsplit 8 "20 Aug 2002" "OpenVZ" "Virtual Private Servers"
++.SH NAME
++vzsplit \- generate a sample VPS configuration file with a certain set of system resource control parameters.
++.SH SYNOPSIS
++vzsplit [\fB-n\fR \fInumve\fR] [\fB-f\fR \fIconf_name\fR] [\fB-s\fR \fIswapsize\fR]
++.SH DESCRIPTION
++The \fBvzsplit\fR utility is used to split the Hardware Node into equal parts. It generates a full set of system resource control parameters for the given number of Virtual Private Servers. The values are calculated from the total physical memory of the Hardware Node the utility runs on and the number of Virtual Private Servers the Hardware Node shall be able to run even if the given number of Virtual Private Servers consume all resources available.
++Without any option \fBvzsplit\fR prompts for the desired number of Virtual Private Servers and outputs the resulting resource control parameters to the screen.
++If there is not enough system resources to run the specified number of
++VPSs, an appropriate message is shown and the sample configuration file is not generated.
++.SH OPTIONS
++.TP
++\fB-n\fR \fInumve\fR
++Specify the number of VPSs.
++.TP
++\fB-f\fR \fIconf_name\fR
++Specify the configuration file name. The program output is placed to
++/etc/sysconfig/vz-scripts/ve-\fIconf_name\fR.conf-sample.
++.TP
++\fB-s\fR \fIswapsize\fR
++Specify the swap size in Kbytes. If not provided in the option, the swap size will be read from /proc/meminfo.
++.SH DIAGNOSTICS
++\fBvzsplit\fR returns 0 upon a sucessful execution. If anything goes wrong, it
++returns 1.	
++.SH SEE ALSO
++.BR vps.conf (5).
++.SH LICENSE
++Copyright (C) 2000-2005, SWsoft. Licensed under QPL.
++
 diff -urN vzctl-2.7.0-23/src/Makefile vzctl-2.7.0-23_etc_vz/src/Makefile
 --- vzctl-2.7.0-23/src/Makefile	2005-10-23 00:30:51.063838616 +0400
 +++ vzctl-2.7.0-23_etc_vz/src/Makefile	2005-10-23 00:31:40.961253056 +0400