Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vzctl/patches/3.0.0.4/vzctl-3.0.0.2-amd64.patch105
-rw-r--r--vzctl/patches/3.0.0.4/vzctl-3.0.0.2-gentoo_conf_d.patch112
-rw-r--r--vzctl/patches/3.0.0.4/vzctl-3.0.0.2-gentoo_etc_vz.patch173
-rwxr-xr-xvzctl/patches/mkrelease4
4 files changed, 393 insertions, 1 deletions
diff --git a/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-amd64.patch b/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-amd64.patch
new file mode 100644
index 0000000..73879f7
--- /dev/null
+++ b/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-amd64.patch
@@ -0,0 +1,105 @@
+diff -NurpP vzctl-3.0.0-2/etc/ifdown-venet vzctl-3.0.0-2-amd64/etc/ifdown-venet
+--- vzctl-3.0.0-2/etc/ifdown-venet 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/ifdown-venet 2006-02-23 16:38:30.361613250 +0100
+@@ -9,7 +9,7 @@
+ # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ test -f /etc/sysconfig/vz || exit 1
+-test -f /usr/lib/vzctl/scripts/vps-functions || exit 1
++test -f /usr/lib64/vzctl/scripts/vps-functions || exit 1
+ test -f /etc/init.d/functions && . /etc/init.d/functions
+
+ ## SuSE distro
+diff -NurpP vzctl-3.0.0-2/etc/ifup-venet vzctl-3.0.0-2-amd64/etc/ifup-venet
+--- vzctl-3.0.0-2/etc/ifup-venet 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/ifup-venet 2006-02-23 16:38:30.361613250 +0100
+@@ -9,7 +9,7 @@
+ # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ test -f /etc/sysconfig/vz || exit 1
+-test -f /usr/lib/vzctl/scripts/vps-functions || exit 1
++test -f /usr/lib64/vzctl/scripts/vps-functions || exit 1
+ test -f /etc/init.d/functions && . /etc/init.d/functions
+
+ # configure VZNET
+@@ -26,7 +26,7 @@ else
+ fi
+ vznet=$DEVICE
+ fi
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ . /etc/sysconfig/vz
+
+ veinfo="/proc/vz/veinfo"
+diff -NurpP vzctl-3.0.0-2/etc/vps-create vzctl-3.0.0-2-amd64/etc/vps-create
+--- vzctl-3.0.0-2/etc/vps-create 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/vps-create 2006-02-23 16:38:27.149412500 +0100
+@@ -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-3.0.0-2/etc/vps-net_add vzctl-3.0.0-2-amd64/etc/vps-net_add
+--- vzctl-3.0.0-2/etc/vps-net_add 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/vps-net_add 2006-02-23 16:38:27.153412750 +0100
+@@ -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-3.0.0-2/etc/vpsnetclean vzctl-3.0.0-2-amd64/etc/vpsnetclean
+--- vzctl-3.0.0-2/etc/vpsnetclean 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/vpsnetclean 2006-02-23 16:38:27.153412750 +0100
+@@ -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-3.0.0-2/etc/vps-net_del vzctl-3.0.0-2-amd64/etc/vps-net_del
+--- vzctl-3.0.0-2/etc/vps-net_del 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/vps-net_del 2006-02-23 16:38:27.153412750 +0100
+@@ -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-3.0.0-2/etc/vps-stop vzctl-3.0.0-2-amd64/etc/vps-stop
+--- vzctl-3.0.0-2/etc/vps-stop 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/etc/vps-stop 2006-02-23 16:38:27.157413000 +0100
+@@ -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-3.0.0-2/src/Makefile vzctl-3.0.0-2-amd64/src/Makefile
+--- vzctl-3.0.0-2/src/Makefile 2006-02-23 16:05:37.000000000 +0100
++++ vzctl-3.0.0-2-amd64/src/Makefile 2006-02-23 16:36:59.511935500 +0100
+@@ -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/3.0.0.4/vzctl-3.0.0.2-gentoo_conf_d.patch b/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-gentoo_conf_d.patch
new file mode 100644
index 0000000..0f38559
--- /dev/null
+++ b/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-gentoo_conf_d.patch
@@ -0,0 +1,112 @@
+diff -NurpP vzctl-3.0.0-2/etc/vpsnetclean vzctl-3.0.0-2-confd/etc/vpsnetclean
+--- vzctl-3.0.0-2/etc/vpsnetclean 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/etc/vpsnetclean 2006-02-23 16:41:55.902458750 +0100
+@@ -17,7 +17,7 @@ VES_INFO=
+ VE_RUN=
+ VE_PREV=
+
+-. /etc/sysconfig/vz
++. /etc/conf.d/vz
+
+
+ #
+diff -NurpP vzctl-3.0.0-2/etc/vpsreboot vzctl-3.0.0-2-confd/etc/vpsreboot
+--- vzctl-3.0.0-2/etc/vpsreboot 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/etc/vpsreboot 2006-02-23 16:42:40.845267500 +0100
+@@ -16,8 +16,8 @@ VE_INFO=/proc/vz/veinfo
+ 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 @@ function check_reboot()
+ 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 -NurpP vzctl-3.0.0-2/include/types.h vzctl-3.0.0-2-confd/include/types.h
+--- vzctl-3.0.0-2/include/types.h 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/include/types.h 2006-02-23 16:43:21.271794000 +0100
+@@ -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 -NurpP vzctl-3.0.0-2/include/vzlist.h vzctl-3.0.0-2-confd/include/vzlist.h
+--- vzctl-3.0.0-2/include/vzlist.h 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/include/vzlist.h 2006-02-23 16:43:48.697508000 +0100
+@@ -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 -NurpP vzctl-3.0.0-2/man/vz.5 vzctl-3.0.0-2-confd/man/vz.5
+--- vzctl-3.0.0-2/man/vz.5 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/man/vz.5 2006-02-23 16:44:04.826516000 +0100
+@@ -2,7 +2,7 @@
+ .SH NAME
+ vz \- global OpenVZ configuration file
+ .SH SYNOPSIS
+-/etc/sysconfig/vz
++/etc/conf.d/vz
+ .SH DESCRIPTION
+ This is global configuration file for OpenVZ.
+ It consists of lines in the form
+diff -NurpP vzctl-3.0.0-2/man/vzctl.8 vzctl-3.0.0-2-confd/man/vzctl.8
+--- vzctl-3.0.0-2/man/vzctl.8 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/man/vzctl.8 2006-02-23 16:44:30.568124750 +0100
+@@ -420,7 +420,7 @@ To permanently remove this VPS:
+ .SH FILES
+ .ad l
+ \f(CR
+-/etc/sysconfig/vz
++/etc/conf.d/vz
+ .br
+ /etc/sysconfig/vz-scripts/vpsid.conf
+ .br
+diff -NurpP vzctl-3.0.0-2/src/Makefile vzctl-3.0.0-2-confd/src/Makefile
+--- vzctl-3.0.0-2/src/Makefile 2006-02-23 16:53:18.749134000 +0100
++++ vzctl-3.0.0-2-confd/src/Makefile 2006-02-23 16:46:13.882581500 +0100
+@@ -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
+@@ -134,7 +134,7 @@ inst-netscripts:
+ $(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_IA64); do \
+ $(INSTALL) ../etc/$$file.ia64 $(DESTDIR)$(VPSCONFDIR)/$$file; \
+@@ -171,6 +171,7 @@ inst-dirs:
+ $(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: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \
diff --git a/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-gentoo_etc_vz.patch b/vzctl/patches/3.0.0.4/vzctl-3.0.0.2-gentoo_etc_vz.patch
new file mode 100644
index 0000000..63364d3
--- /dev/null
+++ b/vzctl/patches/3.0.0.4/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
diff --git a/vzctl/patches/mkrelease b/vzctl/patches/mkrelease
index 90c64f4..a20ebb6 100755
--- a/vzctl/patches/mkrelease
+++ b/vzctl/patches/mkrelease
@@ -7,12 +7,14 @@ fi
VER="${1/-/.}"
REV="${2}"
+EXREV="-${REV}"
+[[ "${REV}" == "r0" ]] && EXREV=
shift 2
tmpdir=$(mktemp -du)
-svn export ${VER}-${REV} ${tmpdir}
+svn export ${VER}${EXREV} ${tmpdir}
mkdir $tmpdir/patches
mv $tmpdir/*.patch $tmpdir/patches/