Adding patchset for 3.0.10

svn path=/; revision=374

1 files changed, 147 insertions, 0 deletions

diff --git a/vzctl/patches/3.0.10/vzctl-3.0.0.10-amd64.patch b/vzctl/patches/3.0.10/vzctl-3.0.0.10-amd64.patch
new file mode 100644
index 0000000..57a56a6
--- /dev/null
+++ b/vzctl/patches/3.0.10/vzctl-3.0.0.10-amd64.patch
@@ -0,0 +1,147 @@
+Index: vzctl-3.0.10/etc/ifdown-venet
+===================================================================
+--- vzctl-3.0.10.orig/etc/ifdown-venet
++++ vzctl-3.0.10/etc/ifdown-venet
+@@ -17,7 +17,7 @@
+ #
+ 
+ test -f /etc/vz/vz.conf || 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
+Index: vzctl-3.0.10/etc/ifup-venet
+===================================================================
+--- vzctl-3.0.10.orig/etc/ifup-venet
++++ vzctl-3.0.10/etc/ifup-venet
+@@ -18,7 +18,7 @@
+ 
+ VZCONF=/etc/vz/vz.conf
+ test -f ${VZCONF} || 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
+@@ -35,7 +35,7 @@ else
+ 	fi
+ 	vznet=$DEVICE
+ fi
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ . ${VZCONF}
+ 
+ veinfo="/proc/vz/veinfo"
+Index: vzctl-3.0.10/etc/vps-create
+===================================================================
+--- vzctl-3.0.10.orig/etc/vps-create
++++ vzctl-3.0.10/etc/vps-create
+@@ -24,7 +24,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
+ 
+Index: vzctl-3.0.10/etc/vps-net_add
+===================================================================
+--- vzctl-3.0.10.orig/etc/vps-net_add
++++ vzctl-3.0.10/etc/vps-net_add
+@@ -26,7 +26,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
+ 
+Index: vzctl-3.0.10/etc/vps-net_del
+===================================================================
+--- vzctl-3.0.10.orig/etc/vps-net_del
++++ vzctl-3.0.10/etc/vps-net_del
+@@ -26,7 +26,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
+ 
+Index: vzctl-3.0.10/etc/vps-stop
+===================================================================
+--- vzctl-3.0.10.orig/etc/vps-stop
++++ vzctl-3.0.10/etc/vps-stop
+@@ -23,7 +23,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
+Index: vzctl-3.0.10/etc/vpsnetclean
+===================================================================
+--- vzctl-3.0.10.orig/etc/vpsnetclean
++++ vzctl-3.0.10/etc/vpsnetclean
+@@ -25,9 +25,9 @@ VE_RUN=
+ VE_PREV=
+ 
+ test -f ${VZCONF} || exit 1
+-test -f /usr/lib/vzctl/scripts/vps-functions || exit 1
++test -f /usr/lib64/vzctl/scripts/vps-functions || exit 1
+ 
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ . ${VZCONF}
+ 
+ #
+Index: vzctl-3.0.10/include/modules.h
+===================================================================
+--- vzctl-3.0.10.orig/include/modules.h
++++ vzctl-3.0.10/include/modules.h
+@@ -24,7 +24,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"
+ 
+Index: vzctl-3.0.10/include/types.h
+===================================================================
+--- vzctl-3.0.10.orig/include/types.h
++++ vzctl-3.0.10/include/types.h
+@@ -21,7 +21,7 @@
+ #define VZ_DIR			"/etc/vz/"
+ #define GLOBAL_CFG		VZ_DIR"vz.conf"
+ #define VPS_CONF_DIR		VZ_DIR"/conf/"
+-#define LIB_SCRIPTS_DIR		"/usr/lib/vzctl/scripts/"
++#define LIB_SCRIPTS_DIR		"/usr/lib64/vzctl/scripts/"
+ #define DIST_DIR		VZ_DIR"dists"
+ 
+ #define VPS_STOP		LIB_SCRIPTS_DIR "vps-stop"
+Index: vzctl-3.0.10/src/Makefile
+===================================================================
+--- vzctl-3.0.10.orig/src/Makefile
++++ vzctl-3.0.10/src/Makefile
+@@ -17,11 +17,11 @@
+      INSTALL = install
+       PREFIX = /usr
+      SBINDIR = $(PREFIX)/sbin
+-      LIBDIR = $(PREFIX)/lib/vzctl
++      LIBDIR = $(PREFIX)/lib64/vzctl
+      CONFDIR = /etc/vz
+    GLBCONFIG = $(CONFDIR)/vz.conf
+   VPSCONFDIR = /etc/vz/conf
+-LIBSCRIPTSDIR = /usr/lib/vzctl/scripts/
++LIBSCRIPTSDIR = /usr/lib64/vzctl/scripts/
+   SCRIPTSDIR = /usr/share/vzctl/scripts
+ NETSCRIPTDIR = /etc/sysconfig/network-scripts
+     CRONDDIR = /etc/cron.d