diff options
Diffstat (limited to 'vzctl/patches/3.0.0.2/vzctl-3.0.0.2-gentoo_etc_vz.patch')
| -rw-r--r-- | vzctl/patches/3.0.0.2/vzctl-3.0.0.2-gentoo_etc_vz.patch | 173 |
1 files changed, 173 insertions, 0 deletions
diff --git a/vzctl/patches/3.0.0.2/vzctl-3.0.0.2-gentoo_etc_vz.patch b/vzctl/patches/3.0.0.2/vzctl-3.0.0.2-gentoo_etc_vz.patch new file mode 100644 index 0000000..63364d3 --- /dev/null +++ b/vzctl/patches/3.0.0.2/vzctl-3.0.0.2-gentoo_etc_vz.patch @@ -0,0 +1,173 @@ +diff -NurpP vzctl-3.0.0-2-confd/etc/cron.d/vpsnetclean vzctl-3.0.0-2-etcvz/etc/cron.d/vpsnetclean +--- vzctl-3.0.0-2-confd/etc/cron.d/vpsnetclean 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/etc/cron.d/vpsnetclean 2006-02-23 16:54:51.330920000 +0100 +@@ -10,5 +10,5 @@ + # Clean VPS network rules (arp,route,iptables) + # + +-*/5 * * * * root /etc/sysconfig/vz-scripts/vpsnetclean ++*/5 * * * * root /etc/vz/vpsnetclean + +diff -NurpP vzctl-3.0.0-2-confd/etc/cron.d/vpsreboot vzctl-3.0.0-2-etcvz/etc/cron.d/vpsreboot +--- vzctl-3.0.0-2-confd/etc/cron.d/vpsreboot 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/etc/cron.d/vpsreboot 2006-02-23 16:54:51.330920000 +0100 +@@ -11,4 +11,4 @@ + # If vzagent not installed you can enable reboot functionality by + # commented out the line below. + +-*/5 * * * * root /etc/sysconfig/vz-scripts/vpsreboot ++*/5 * * * * root /etc/vz/vpsreboot +diff -NurpP vzctl-3.0.0-2-confd/etc/dists/Makefile vzctl-3.0.0-2-etcvz/etc/dists/Makefile +--- vzctl-3.0.0-2-confd/etc/dists/Makefile 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/etc/dists/Makefile 2006-02-23 16:54:51.330920000 +0100 +@@ -8,7 +8,7 @@ + # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + INSTALL = install +-DISTCONFDIR = /etc/sysconfig/vz-scripts/dists ++DISTCONFDIR = /etc/vz/dists + DISTSCRIPTDIR = ${DISTCONFDIR}/scripts + DISTSCRIPTS = debian-add_ip.sh debian-del_ip.sh debian-set_hostname.sh \ + functions postcreate.sh redhat-7.x_add_ip.sh redhat-add_ip.sh \ +diff -NurpP vzctl-3.0.0-2-confd/etc/vps-functions vzctl-3.0.0-2-etcvz/etc/vps-functions +--- vzctl-3.0.0-2-confd/etc/vps-functions 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/etc/vps-functions 2006-02-23 16:54:51.330920000 +0100 +@@ -26,7 +26,7 @@ VZ_IP_INUSE=78 + + # iptables parameters + VE_STATE_DIR="/var/vz/veip/" +-CONF_DIR="/etc/sysconfig/vz-scripts/" ++CONF_DIR="/etc/vz/" + + ARPSEND_CMD="arpsend -c 1 -w 1" + IP_CMD=/sbin/ip +diff -NurpP vzctl-3.0.0-2-confd/etc/vpsreboot vzctl-3.0.0-2-etcvz/etc/vpsreboot +--- vzctl-3.0.0-2-confd/etc/vpsreboot 2006-02-23 16:42:40.845267500 +0100 ++++ vzctl-3.0.0-2-etcvz/etc/vpsreboot 2006-02-23 16:54:51.330920000 +0100 +@@ -11,7 +11,7 @@ + # Script to start VPS was rebooted + # + +-CONF_DIR=/etc/sysconfig/vz-scripts ++CONF_DIR=/etc/vz + VE_INFO=/proc/vz/veinfo + REBOOT_MARK='reboot' + LOCKFILE='/var/lock/vereboot.lock' +diff -NurpP vzctl-3.0.0-2-confd/include/dist.h vzctl-3.0.0-2-etcvz/include/dist.h +--- vzctl-3.0.0-2-confd/include/dist.h 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/include/dist.h 2006-02-23 16:54:51.330920000 +0100 +@@ -23,7 +23,7 @@ + #define SET_UGID_QUOTA 6 + #define POST_CREATE 7 + +-#define DIST_DIR "/etc/sysconfig/vz-scripts/dists" ++#define DIST_DIR "/etc/vz/dists" + + typedef struct { + char *def_ostmpl; +diff -NurpP vzctl-3.0.0-2-confd/include/types.h vzctl-3.0.0-2-etcvz/include/types.h +--- vzctl-3.0.0-2-confd/include/types.h 2006-02-23 16:43:21.271794000 +0100 ++++ vzctl-3.0.0-2-etcvz/include/types.h 2006-02-23 16:54:51.330920000 +0100 +@@ -12,7 +12,7 @@ + #define _TYPES_H_ + + #define GLOBAL_CFG "/etc/conf.d/vz" +-#define VPS_CONF_DIR "/etc/sysconfig/vz-scripts/" ++#define VPS_CONF_DIR "/etc/vz/" + #define LIB_DIR "/usr/lib/vzctl/lib/" + #define VPS_SCRIPTS_DIR "/usr/lib/vzctl/scripts/" + +diff -NurpP vzctl-3.0.0-2-confd/include/vzlist.h vzctl-3.0.0-2-etcvz/include/vzlist.h +--- vzctl-3.0.0-2-confd/include/vzlist.h 2006-02-23 16:43:48.697508000 +0100 ++++ vzctl-3.0.0-2-etcvz/include/vzlist.h 2006-02-23 16:54:51.330920000 +0100 +@@ -25,7 +25,7 @@ + #define PROCVEINFO "/proc/vz/veinfo" + #define PROCFSHED "/proc/fairsched" + +-#define SCRIPT_DIR "/etc/sysconfig/vz-scripts/" ++#define SCRIPT_DIR "/etc/vz/" + #define CFG_FILE "/etc/conf.d/vz" + #define VZQUOTA "/usr/sbin/vzquota" + +diff -NurpP vzctl-3.0.0-2-confd/man/vps.conf.5 vzctl-3.0.0-2-etcvz/man/vps.conf.5 +--- vzctl-3.0.0-2-confd/man/vps.conf.5 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/man/vps.conf.5 2006-02-23 16:54:51.334920250 +0100 +@@ -3,10 +3,10 @@ + .SH NAME + vps.conf \- configuration file for a Virtual Private Server. + .SH SYNOPSIS +-/etc/sysconfig/vz-scripts/XXX.conf ++/etc/vz/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 ++\fB/etc/vz/\fR\fIXXX\fB.conf\fR, where \fIXXX\fR + is the ID of the given VPS. + .PP + Configuration file consists of lines in the form +diff -NurpP vzctl-3.0.0-2-confd/man/vzctl.8 vzctl-3.0.0-2-etcvz/man/vzctl.8 +--- vzctl-3.0.0-2-confd/man/vzctl.8 2006-02-23 16:44:30.568124750 +0100 ++++ vzctl-3.0.0-2-etcvz/man/vzctl.8 2006-02-23 16:54:51.334920250 +0100 +@@ -318,7 +318,7 @@ Give access (\fBr\fR - read, \fBw\fR - w + .TP + \fB--applyconfig\fR \fIname\fR + Read VPS parameters from VPS sample configuration file +-\f(CW\fB/etc/sysconfig/vz-scripts/ve-\fIname\fR\f(CW\fB.conf-sample\fR, and ++\f(CW\fB/etc/vz/ve-\fIname\fR\f(CW\fB.conf-sample\fR, and + apply them, if --save option specified save to VPS config file. These parameters + are not changed (\fBHOSTNAME\fR \fBIP_ADDRESS\fR \fBOSTEMPLATE\fR \fBVE_ROOT\fR \fBVE_PRIVATE\fR) + .SS Performing VPS actions +@@ -328,7 +328,7 @@ startup of VPS. + + If the \fB--config\fR \fIname\fR option is specified, values from + example configuration file +-\f(CW\fB/etc/sysconfig/vz-scripts/ve-\fIname\fR\f(CW\fB.conf-sample\fR ++\f(CW\fB/etc/vz/ve-\fIname\fR\f(CW\fB.conf-sample\fR + are put into VPS configuration file. If VPS configuration file already exists, + it will be removed. + +@@ -422,7 +422,7 @@ To permanently remove this VPS: + \f(CR + /etc/conf.d/vz + .br +-/etc/sysconfig/vz-scripts/vpsid.conf ++/etc/vz/vpsid.conf + .br + /proc/vz/veinfo + .br +diff -NurpP vzctl-3.0.0-2-confd/man/vzsplit.8 vzctl-3.0.0-2-etcvz/man/vzsplit.8 +--- vzctl-3.0.0-2-confd/man/vzsplit.8 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/man/vzsplit.8 2006-02-23 16:54:51.334920250 +0100 +@@ -16,7 +16,7 @@ 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. ++/etc/vz/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. +diff -NurpP vzctl-3.0.0-2-confd/src/Makefile vzctl-3.0.0-2-etcvz/src/Makefile +--- vzctl-3.0.0-2-confd/src/Makefile 2006-02-23 16:46:13.882581500 +0100 ++++ vzctl-3.0.0-2-etcvz/src/Makefile 2006-02-23 16:54:51.334920250 +0100 +@@ -14,7 +14,7 @@ + LIBDIR = $(PREFIX)/lib/vzctl + CACHEDIR = /vz/template/cache + VZCONFDIR = /etc/conf.d +- VPSCONFDIR = /etc/sysconfig/vz-scripts ++ VPSCONFDIR = /etc/vz + DISTCONFDIR = $(VPSCONFDIR)/dists + NETSCRIPTDIR = /etc/sysconfig/network-scripts + CRONDDIR = /etc/cron.d +diff -NurpP vzctl-3.0.0-2-confd/src/vzsplit.c vzctl-3.0.0-2-etcvz/src/vzsplit.c +--- vzctl-3.0.0-2-confd/src/vzsplit.c 2006-02-23 16:05:37.000000000 +0100 ++++ vzctl-3.0.0-2-etcvz/src/vzsplit.c 2006-02-23 16:54:51.334920250 +0100 +@@ -27,7 +27,7 @@ + + #define PROCMEM "/proc/meminfo" + #define PROCTHREADS "/proc/sys/kernel/threads-max" +-#define OUTPATH "/etc/sysconfig/vz-scripts/" ++#define OUTPATH "/etc/vz/" + #define PROCCPU "/proc/cpuinfo" + + #define MAX_SL 3 |