diff options
author | Christian Heim <phreak@gentoo.org> | 2006-02-18 08:43:02 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2006-02-18 08:43:02 +0000 |
commit | 867224ac4d46f2a5cf513a621bc29d7b4eeb2373 (patch) | |
tree | de289eae0fa0c49119b8e82e9d9736ebc5ef19da /vzctl | |
parent | Patches needed for 2.7.0-25 (diff) | |
download | misc-867224ac4d46f2a5cf513a621bc29d7b4eeb2373.tar.gz misc-867224ac4d46f2a5cf513a621bc29d7b4eeb2373.tar.bz2 misc-867224ac4d46f2a5cf513a621bc29d7b4eeb2373.zip |
Patches needed for 2.7.0-24
svn path=/; revision=244
Diffstat (limited to 'vzctl')
-rw-r--r-- | vzctl/patches/2.7.0.24/vzctl-2.7.0-amd64.patch | 110 | ||||
-rw-r--r-- | vzctl/patches/2.7.0.24/vzctl-2.7.0-gentoo_conf_d.patch | 112 | ||||
-rw-r--r-- | vzctl/patches/2.7.0.24/vzctl-2.7.0.23-gentoo_etc_vz.patch | 173 | ||||
-rw-r--r-- | vzctl/patches/2.7.0.24/vzctl-2.7.0.24-pic.patch | 63 |
4 files changed, 458 insertions, 0 deletions
diff --git a/vzctl/patches/2.7.0.24/vzctl-2.7.0-amd64.patch b/vzctl/patches/2.7.0.24/vzctl-2.7.0-amd64.patch new file mode 100644 index 0000000..bc8c482 --- /dev/null +++ b/vzctl/patches/2.7.0.24/vzctl-2.7.0-amd64.patch @@ -0,0 +1,110 @@ +diff -NurpP vzctl-2.7.0-25/etc/ifup-venet vzctl-2.7.0-25-amd64/etc/ifup-venet +--- vzctl-2.7.0-25/etc/ifup-venet 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/ifup-venet 2006-01-12 16:54:15.145147672 +0300 +@@ -21,7 +21,7 @@ vznet=$DEVICE + modvenet="vznetdev vznet" + + . /etc/init.d/functions +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + . /etc/sysconfig/vz + + veinfo="/proc/vz/veinfo" +diff -NurpP vzctl-2.7.0-25/etc/vps-create vzctl-2.7.0-25-amd64/etc/vps-create +--- vzctl-2.7.0-25/etc/vps-create 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-create 2006-01-12 16:54:09.680978352 +0300 +@@ -16,7 +16,7 @@ + # VE_PRVT - path to root of VPS private areas + # PRIVATE_TEMPLATE - path to private template used as a source for copying + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + vzcheckvar VE_PRVT PRIVATE_TEMPLATE + +diff -NurpP vzctl-2.7.0-25/etc/vps-net_add vzctl-2.7.0-25-amd64/etc/vps-net_add +--- vzctl-2.7.0-25/etc/vps-net_add 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-net_add 2006-01-12 16:54:09.681978200 +0300 +@@ -18,7 +18,7 @@ + # (several addresses should be divided by space) + # VE_STATE - state of VPS; could be one of: + # starting | stopping | running | stopped +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + vzcheckvar VEID + +diff -NurpP vzctl-2.7.0-25/etc/vps-net_del vzctl-2.7.0-25-amd64/etc/vps-net_del +--- vzctl-2.7.0-25/etc/vps-net_del 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-net_del 2006-01-12 16:54:09.682978048 +0300 +@@ -18,7 +18,7 @@ + # VE_STATE - state of VPS; could be one of: + # starting | stopping | running | stopped + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + vzcheckvar IP_ADDR VEID + +diff -NurpP vzctl-2.7.0-25/etc/vps-stop vzctl-2.7.0-25-amd64/etc/vps-stop +--- vzctl-2.7.0-25/etc/vps-stop 2005-12-29 16:57:05.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vps-stop 2006-01-12 16:54:09.682978048 +0300 +@@ -15,7 +15,7 @@ + # VEID - VPS id + # IP_ADDR - VPS IP address(es) divided by spaces + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + # get list of network devices for vzarp + vzgetnetdev +diff -NurpP vzctl-2.7.0-25/etc/vpsnetclean vzctl-2.7.0-25-amd64/etc/vpsnetclean +--- vzctl-2.7.0-25/etc/vpsnetclean 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/etc/vpsnetclean 2006-01-12 16:54:09.683977896 +0300 +@@ -9,7 +9,7 @@ + # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + # + +-. /usr/lib/vzctl/scripts/vps-functions ++. /usr/lib64/vzctl/scripts/vps-functions + + VEINFO=/proc/vz/veinfo + PROC_PROXY_TR=/proc/proxy/targets +diff -NurpP vzctl-2.7.0-25/include/modules.h vzctl-2.7.0-25-amd64/include/modules.h +--- vzctl-2.7.0-25/include/modules.h 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/include/modules.h 2006-01-12 16:52:10.262132776 +0300 +@@ -17,7 +17,7 @@ + #define TYPE_CMD 0 + #define TYPE_CONF 1 + +-#define MOD_DIR "/usr/lib/vzctl/modules/" ++#define MOD_DIR "/usr/lib64/vzctl/modules/" + + #define MOD_INFO_SYM "vz_get_mod_info" + +diff -NurpP vzctl-2.7.0-25/include/types.h vzctl-2.7.0-25-amd64/include/types.h +--- vzctl-2.7.0-25/include/types.h 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/include/types.h 2006-01-12 16:52:23.307149632 +0300 +@@ -13,8 +13,8 @@ + + #define GLOBAL_CFG "/etc/conf.d/vz" + #define VPS_CONF_DIR "/etc/vz/" +-#define LIB_DIR "/usr/lib/vzctl/lib/" +-#define VPS_SCRIPTS_DIR "/usr/lib/vzctl/scripts/" ++#define LIB_DIR "/usr/lib64/vzctl/lib/" ++#define VPS_SCRIPTS_DIR "/usr/lib64/vzctl/scripts/" + + #define VPS_STOP VPS_SCRIPTS_DIR "vps-stop" + #define VPS_NET_ADD VPS_SCRIPTS_DIR "vps-net_add" +diff -NurpP vzctl-2.7.0-25/src/Makefile vzctl-2.7.0-25-amd64/src/Makefile +--- vzctl-2.7.0-25/src/Makefile 2005-12-29 16:57:06.000000000 +0300 ++++ vzctl-2.7.0-25-amd64/src/Makefile 2006-01-12 16:51:56.383242688 +0300 +@@ -11,7 +11,7 @@ + INSTALL = install + PREFIX = /usr + SBINDIR = $(PREFIX)/sbin +- LIBDIR = $(PREFIX)/lib/vzctl ++ LIBDIR = $(PREFIX)/lib64/vzctl + CACHEDIR = /vz/template/cache + GLBCONFIG = /etc/sysconfig/vz + VPSCONFDIR = /etc/sysconfig/vz-scripts diff --git a/vzctl/patches/2.7.0.24/vzctl-2.7.0-gentoo_conf_d.patch b/vzctl/patches/2.7.0.24/vzctl-2.7.0-gentoo_conf_d.patch new file mode 100644 index 0000000..b5d3cfa --- /dev/null +++ b/vzctl/patches/2.7.0.24/vzctl-2.7.0-gentoo_conf_d.patch @@ -0,0 +1,112 @@ +diff -ur vzctl-2.7.0-21/etc/vpsnetclean vzctl-2.7.0-21-gentoo/etc/vpsnetclean +--- vzctl-2.7.0-21/etc/vpsnetclean 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/etc/vpsnetclean 2005-09-23 00:43:35.000000000 +0400 +@@ -17,7 +17,7 @@ + VE_RUN= + VE_PREV= + +-. /etc/sysconfig/vz ++. /etc/conf.d/vz + + + # +diff -ur vzctl-2.7.0-21/etc/vpsreboot vzctl-2.7.0-21-gentoo/etc/vpsreboot +--- vzctl-2.7.0-21/etc/vpsreboot 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/etc/vpsreboot 2005-09-23 00:42:56.000000000 +0400 +@@ -16,8 +16,8 @@ + REBOOT_MARK='reboot' + LOCKFILE='/var/lock/vereboot.lock' + +-[ -f /etc/sysconfig/vz ] || exit +-. /etc/sysconfig/vz ++[ -f /etc/conf.d/vz ] || exit ++. /etc/conf.d/vz + + function check_reboot() + { +@@ -28,7 +28,7 @@ + VEID=${veid} + [ -f "${CONF_DIR}/${veid}.conf" ] || return + eval ` ( +- . /etc/sysconfig/vz; ++ . /etc/conf.d/vz; + . ${CONF_DIR}/${veid}.conf; + echo ve_root=${VE_ROOT}\;; + echo allowreboot=${ALLOWREBOOT}\;; +diff -ur vzctl-2.7.0-21/include/types.h vzctl-2.7.0-21-gentoo/include/types.h +--- vzctl-2.7.0-21/include/types.h 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/include/types.h 2005-09-23 00:48:31.000000000 +0400 +@@ -11,7 +11,7 @@ + #ifndef _TYPES_H_ + #define _TYPES_H_ + +-#define GLOBAL_CFG "/etc/sysconfig/vz" ++#define GLOBAL_CFG "/etc/conf.d/vz" + #define VPS_CONF_DIR "/etc/sysconfig/vz-scripts/" + #define LIB_DIR "/usr/lib/vzctl/lib/" + #define VPS_SCRIPTS_DIR "/usr/lib/vzctl/scripts/" +diff -ur vzctl-2.7.0-21/include/vzlist.h vzctl-2.7.0-21-gentoo/include/vzlist.h +--- vzctl-2.7.0-21/include/vzlist.h 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/include/vzlist.h 2005-09-23 19:50:57.549383320 +0400 +@@ -26,7 +26,7 @@ + #define PROCFSHED "/proc/fairsched" + + #define SCRIPT_DIR "/etc/sysconfig/vz-scripts/" +-#define CFG_FILE "/etc/sysconfig/vz" ++#define CFG_FILE "/etc/conf.d/vz" + #define VZQUOTA "/usr/sbin/vzquota" + + #define MAXCPUUNITS 500000 +diff -ur vzctl-2.7.0-21/man/vz.5 vzctl-2.7.0-21-gentoo/man/vz.5 +--- vzctl-2.7.0-21/man/vz.5 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/man/vz.5 2005-09-23 00:47:11.000000000 +0400 +@@ -2,7 +2,7 @@ + .SH NAME + vz \- global Open Virtuozzo configuration file + .SH SYNOPSIS +-/etc/sysconfig/vz ++/etc/conf.d/vz + .SH DESCRIPTION + This is global configuration file for Open Virtuozzo. + It consists of lines in the form +diff -ur vzctl-2.7.0-21/man/vzctl.8 vzctl-2.7.0-21-gentoo/man/vzctl.8 +--- vzctl-2.7.0-21/man/vzctl.8 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/man/vzctl.8 2005-09-23 00:47:29.000000000 +0400 +@@ -421,7 +421,7 @@ + .SH FILES + .ad l + \f(CR +-/etc/sysconfig/vz ++/etc/conf.d/vz + .br + /etc/sysconfig/vz-scripts/vpsid.conf + .br +diff -ur vzctl-2.7.0-21/src/Makefile vzctl-2.7.0-21-gentoo/src/Makefile +--- vzctl-2.7.0-21/src/Makefile 2005-09-12 19:23:58.000000000 +0400 ++++ vzctl-2.7.0-21-gentoo/src/Makefile 2005-09-23 19:46:37.460922776 +0400 +@@ -13,7 +13,7 @@ + SBINDIR = $(PREFIX)/sbin + LIBDIR = $(PREFIX)/lib/vzctl + CACHEDIR = /vz/template/cache +- GLBCONFIG = /etc/sysconfig/vz ++ VZCONFDIR = /etc/conf.d + VPSCONFDIR = /etc/sysconfig/vz-scripts + DISTCONFDIR = $(VPSCONFDIR)/dists + NETSCRIPTDIR = /etc/sysconfig/network-scripts +@@ -122,7 +122,7 @@ + $(INSTALL) ../etc/$$file $(DESTDIR)$(NETSCRIPTDIR)/$$file; \ + done + inst-configs: +- $(INSTALL) -m 644 ../etc/vz $(DESTDIR)$(GLBCONFIG) ++ $(INSTALL) -m 644 ../etc/vz $(DESTDIR)$(VZCONFDIR)/vz + ifeq ($(ARCH),ia64) + for file in $(VECONFIG); do \ + $(INSTALL) ../etc/$$file.ia64 $(DESTDIR)$(VPSCONFDIR)/$$file; \ +@@ -153,6 +153,7 @@ + $(INSTALL) -d $(DESTDIR)$(VZLOCKDIR) + $(INSTALL) -d $(DESTDIR)$(LOGRDIR) + $(INSTALL) -d $(DESTDIR)$(CACHEDIR) ++ $(INSTALL) -d $(DESTDIR)$(VZCONFDIR) + $(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl + + install-lib: inst-lib diff --git a/vzctl/patches/2.7.0.24/vzctl-2.7.0.23-gentoo_etc_vz.patch b/vzctl/patches/2.7.0.24/vzctl-2.7.0.23-gentoo_etc_vz.patch new file mode 100644 index 0000000..3d8054e --- /dev/null +++ b/vzctl/patches/2.7.0.24/vzctl-2.7.0.23-gentoo_etc_vz.patch @@ -0,0 +1,173 @@ +diff -urN vzctl-2.7.0-23/etc/cron.d/vpsnetclean vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsnetclean +--- vzctl-2.7.0-23/etc/cron.d/vpsnetclean 2005-08-05 19:46:38.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsnetclean 2005-10-23 00:31:40.956253816 +0400 +@@ -10,5 +10,5 @@ + # Clean VPS network rules (arp,route,iptables) + # + +-*/5 * * * * root /etc/sysconfig/vz-scripts/vpsnetclean ++*/5 * * * * root /etc/vz/vpsnetclean + +diff -urN vzctl-2.7.0-23/etc/cron.d/vpsreboot vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsreboot +--- vzctl-2.7.0-23/etc/cron.d/vpsreboot 2005-08-05 20:40:45.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/etc/cron.d/vpsreboot 2005-10-23 00:31:40.957253664 +0400 +@@ -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 -urN vzctl-2.7.0-23/etc/dists/Makefile vzctl-2.7.0-23_etc_vz/etc/dists/Makefile +--- vzctl-2.7.0-23/etc/dists/Makefile 2005-08-12 16:37:33.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/etc/dists/Makefile 2005-10-23 00:31:40.957253664 +0400 +@@ -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 -urN vzctl-2.7.0-23/etc/vps-functions vzctl-2.7.0-23_etc_vz/etc/vps-functions +--- vzctl-2.7.0-23/etc/vps-functions 2005-10-17 13:55:59.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/etc/vps-functions 2005-10-23 00:31:40.957253664 +0400 +@@ -26,7 +26,7 @@ + + # 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 -urN vzctl-2.7.0-23/etc/vpsreboot vzctl-2.7.0-23_etc_vz/etc/vpsreboot +--- vzctl-2.7.0-23/etc/vpsreboot 2005-10-23 00:30:51.060839072 +0400 ++++ vzctl-2.7.0-23_etc_vz/etc/vpsreboot 2005-10-23 00:31:40.958253512 +0400 +@@ -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 -urN vzctl-2.7.0-23/include/dist.h vzctl-2.7.0-23_etc_vz/include/dist.h +--- vzctl-2.7.0-23/include/dist.h 2005-08-19 18:08:38.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/include/dist.h 2005-10-23 00:31:40.958253512 +0400 +@@ -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 -urN vzctl-2.7.0-23/include/types.h vzctl-2.7.0-23_etc_vz/include/types.h +--- vzctl-2.7.0-23/include/types.h 2005-10-23 00:30:51.060839072 +0400 ++++ vzctl-2.7.0-23_etc_vz/include/types.h 2005-10-23 00:31:40.958253512 +0400 +@@ -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 -urN vzctl-2.7.0-23/include/vzlist.h vzctl-2.7.0-23_etc_vz/include/vzlist.h +--- vzctl-2.7.0-23/include/vzlist.h 2005-10-23 00:30:51.061838920 +0400 ++++ vzctl-2.7.0-23_etc_vz/include/vzlist.h 2005-10-23 00:31:40.959253360 +0400 +@@ -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 -urN vzctl-2.7.0-23/man/vps.conf.5 vzctl-2.7.0-23_etc_vz/man/vps.conf.5 +--- vzctl-2.7.0-23/man/vps.conf.5 2005-10-17 16:50:30.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/man/vps.conf.5 2005-10-23 00:31:40.959253360 +0400 +@@ -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 -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 +@@ -318,7 +318,7 @@ + .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 @@ + + 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 @@ + \f(CR + /etc/conf.d/vz + .br +-/etc/sysconfig/vz-scripts/vpsid.conf ++/etc/vz/vpsid.conf + .br + /proc/vz/veinfo + .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 +@@ -16,7 +16,7 @@ + .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 -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 +@@ -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 -urN vzctl-2.7.0-23/src/vzsplit.c vzctl-2.7.0-23_etc_vz/src/vzsplit.c +--- vzctl-2.7.0-23/src/vzsplit.c 2005-09-27 15:01:16.000000000 +0400 ++++ vzctl-2.7.0-23_etc_vz/src/vzsplit.c 2005-10-23 00:31:40.962252904 +0400 +@@ -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 diff --git a/vzctl/patches/2.7.0.24/vzctl-2.7.0.24-pic.patch b/vzctl/patches/2.7.0.24/vzctl-2.7.0.24-pic.patch new file mode 100644 index 0000000..d7a2395 --- /dev/null +++ b/vzctl/patches/2.7.0.24/vzctl-2.7.0.24-pic.patch @@ -0,0 +1,63 @@ +Index: vzctl-2.7.0-24/src/Makefile +=================================================================== +--- vzctl-2.7.0-24.orig/src/Makefile ++++ vzctl-2.7.0-24/src/Makefile +@@ -25,16 +25,17 @@ NETSCRIPTDIR = /etc/sysconfig/network-sc + + export LD_LIBRARY_PATH=. + CC = gcc +-CFLAGS = -Wall -g2 ++CFLAGS = -Wall -g2 ++SHAREDLIB_CFLAGS = -fPIC + VZKERNEL_HEADERS ?= /lib/modules/$(shell uname -r)/build/include + INC = -I ../include -I$(VZKERNEL_HEADERS) + ARCH=$(shell uname -i) + +-OBJ_libvzctl = lib/env.o lib/ub.o lib/net.o lib/logger.o lib/exec.o lib/cap.o \ +- lib/cpu.o lib/res.o lib/util.o lib/dist.o lib/list.o lib/script.o \ +- lib/dev.o lib/config.o lib/lock.o lib/quota.o lib/modules.o \ +- lib/iptables.o lib/fs.o lib/create.o +-OBJ_simfs=lib/fs_simfs.o ++OBJ_libvzctl = lib/env.lo lib/ub.lo lib/net.lo lib/logger.lo lib/exec.lo \ ++ lib/cap.lo lib/cpu.lo lib/res.lo lib/util.lo lib/dist.lo lib/list.lo \ ++ lib/script.lo lib/dev.lo lib/config.lo lib/lock.lo lib/quota.lo \ ++ lib/modules.lo lib/iptables.lo lib/fs.lo lib/create.lo ++OBJ_simfs=lib/fs_simfs.lo + OBJ_vzctl = vzctl.o vzctl-actions.o modules.o enter.o + OBJ_vzlist = vzlist.o + OBJ_arp = arpsend.o +@@ -42,7 +43,9 @@ OBJ_split = vzsplit.o + OBJ_memcheck = vzmemcheck.o validate.o + OBJ_cfgvalidate = vzcfgvalidate.o validate.o + OBJ_calc = vzcalc.o +-OBJ = $(OBJ_libvzctl) $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_split) ++OBJ = $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_arp) $(OBJ_split) $(OBJ_memcheck) \ ++ $(OBJ_cfgvalidate) $(OBJ_calc) ++SOBJ = $(OBJ_libvzctl) $(OBJ_simfs) + LIB_vzctl = libvzctl.so.$(LIB_VER) + LIB_simfs = libvzctl-simfs.so.$(LIB_VER) + LIB_fs = libvzctl-fs.so +@@ -69,6 +72,9 @@ all: $(PROGS) $(LIBS) + %.o: %.c + $(CC) -c $(CFLAGS) $(INC) $< -o $@ + ++%.lo: %.c ++ $(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@ ++ + $(LIB_simfs) : $(OBJ_simfs) + $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@ + +@@ -171,10 +177,10 @@ inst-dirs: + install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \ + inst-netscripts inst-configs inst-initd inst-cron + clean: +- rm -f *.o lib/*.o $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend ++ rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend + +-.depend:: $(OBJ:.o=.c) +- $(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $(OBJ:.o=.c) >.depend ++.depend:: $(OBJ:.o=.c) $(SOBJ:.lo=.c) ++ $(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $^ >.depend + + depend:: .depend + |