[vzctl.git] / debian / patches / fix-config-path.diff

Index: new/include/types.h
===================================================================
--- new.orig/include/types.h	2011-11-17 08:05:21.000000000 +0100
+++ new/include/types.h	2011-11-17 08:05:45.000000000 +0100
@@ -21,7 +21,7 @@
 #define VZ_DIR			PKGCONFDIR "/"
 #define GLOBAL_CFG		VZ_DIR "vz.conf"
 #define OSRELEASE_CFG		VZ_DIR "osrelease.conf"
-#define VPS_CONF_DIR		VZ_DIR "conf/"
+#define VPS_CONF_DIR		"/etc/pve/openvz/"
 #define LIB_SCRIPTS_DIR		PKGLIBDIR "/scripts/"
 #define DIST_DIR		VZ_DIR "dists"
 #define VENAME_DIR		VZ_DIR "names"
Index: new/paths.am
===================================================================
--- new.orig/paths.am	2011-11-17 08:05:21.000000000 +0100
+++ new/paths.am	2011-11-17 08:05:45.000000000 +0100
@@ -32,7 +32,7 @@
 ifupdir     = $(sysconfdir)/network/if-up.d
 
 pkgconfdir  = $(sysconfdir)/vz
-vpsconfdir  = $(pkgconfdir)/conf
+vpsconfdir  = $(sysconfdir)/pve/openvz
 distconfdir = $(pkgconfdir)/dists
 namesdir    = $(pkgconfdir)/names
 
Index: new/bin/vznetaddbr.in
===================================================================
--- new.orig/bin/vznetaddbr.in	2011-11-17 08:02:47.000000000 +0100
+++ new/bin/vznetaddbr.in	2011-11-17 08:05:45.000000000 +0100
@@ -2,7 +2,7 @@
 #
 # Add virtual network interfaces (veth's) in a container to a bridge on CT0
 
-CONFIGFILE=@PKGCONFDIR@/conf/$VEID.conf
+CONFIGFILE=@VPSCONFDIR@/$VEID.conf
 . $CONFIGFILE
 
 NETIFLIST=$(printf %s "$NETIF" |tr ';' '\n')
Index: new/bin/vzmigrate.in
===================================================================
--- new.orig/bin/vzmigrate.in	2011-11-17 08:02:47.000000000 +0100
+++ new/bin/vzmigrate.in	2011-11-17 08:05:45.000000000 +0100
@@ -31,7 +31,7 @@
 remove_area=1
 keep_dst=0
 debug=0
-confdir="@PKGCONFDIR@/conf"
+confdir="@VPSCONFDIR@"
 vzconf="@PKGCONFDIR@/vz.conf"
 tmpdir="/var/tmp"
 act_scripts=
Index: new/etc/init.d/vz-redhat.in
===================================================================
--- new.orig/etc/init.d/vz-redhat.in	2011-11-17 08:06:26.000000000 +0100
+++ new/etc/init.d/vz-redhat.in	2011-11-17 08:07:06.000000000 +0100
@@ -41,7 +41,7 @@
 . @VZLIBDIR@/initd-functions
 
 VZQUOTA=@SBINDIR@/vzquota
-CONFIG_DIR=@PKGCONFDIR@/conf
+CONFIG_DIR=@VPSCONFDIR@
 LOCKFILE=$VARLOCK/vz_lock
 SUBSYS_VZ=$VARLOCK/vz
 VESTAT=/proc/vz/vestat
Commit	Line	Data
10975143 DM	1	Index: new/include/types.h
10975143 DM	2	===================================================================
7dc0704b DM	3	--- new.orig/include/types.h 2011-11-17 08:05:21.000000000 +0100
7dc0704b DM	4	+++ new/include/types.h 2011-11-17 08:05:45.000000000 +0100
10975143 DM	5	@@ -21,7 +21,7 @@
	6	#define VZ_DIR PKGCONFDIR "/"
	7	#define GLOBAL_CFG VZ_DIR "vz.conf"
	8	#define OSRELEASE_CFG VZ_DIR "osrelease.conf"
	9	-#define VPS_CONF_DIR VZ_DIR "conf/"
	10	+#define VPS_CONF_DIR "/etc/pve/openvz/"
	11	#define LIB_SCRIPTS_DIR PKGLIBDIR "/scripts/"
	12	#define DIST_DIR VZ_DIR "dists"
	13	#define VENAME_DIR VZ_DIR "names"
	14	Index: new/paths.am
	15	===================================================================
7dc0704b DM	16	--- new.orig/paths.am 2011-11-17 08:05:21.000000000 +0100
7dc0704b DM	17	+++ new/paths.am 2011-11-17 08:05:45.000000000 +0100
10975143 DM	18	@@ -32,7 +32,7 @@
	19	ifupdir = $(sysconfdir)/network/if-up.d
	20
	21	pkgconfdir = $(sysconfdir)/vz
	22	-vpsconfdir = $(pkgconfdir)/conf
	23	+vpsconfdir = $(sysconfdir)/pve/openvz
	24	distconfdir = $(pkgconfdir)/dists
	25	namesdir = $(pkgconfdir)/names
	26
7dc0704b DM	27	Index: new/bin/vznetaddbr.in
	28	===================================================================
	29	--- new.orig/bin/vznetaddbr.in 2011-11-17 08:02:47.000000000 +0100
	30	+++ new/bin/vznetaddbr.in 2011-11-17 08:05:45.000000000 +0100
	31	@@ -2,7 +2,7 @@
	32	#
	33	# Add virtual network interfaces (veth's) in a container to a bridge on CT0
	34
	35	-CONFIGFILE=@PKGCONFDIR@/conf/$VEID.conf
	36	+CONFIGFILE=@VPSCONFDIR@/$VEID.conf
	37	. $CONFIGFILE
	38
	39	NETIFLIST=$(printf %s "$NETIF" \|tr ';' '\n')
	40	Index: new/bin/vzmigrate.in
	41	===================================================================
	42	--- new.orig/bin/vzmigrate.in 2011-11-17 08:02:47.000000000 +0100
	43	+++ new/bin/vzmigrate.in 2011-11-17 08:05:45.000000000 +0100
	44	@@ -31,7 +31,7 @@
	45	remove_area=1
	46	keep_dst=0
	47	debug=0
	48	-confdir="@PKGCONFDIR@/conf"
	49	+confdir="@VPSCONFDIR@"
	50	vzconf="@PKGCONFDIR@/vz.conf"
	51	tmpdir="/var/tmp"
	52	act_scripts=
	53	Index: new/etc/init.d/vz-redhat.in
	54	===================================================================
	55	--- new.orig/etc/init.d/vz-redhat.in 2011-11-17 08:06:26.000000000 +0100
	56	+++ new/etc/init.d/vz-redhat.in 2011-11-17 08:07:06.000000000 +0100
	57	@@ -41,7 +41,7 @@
	58	. @VZLIBDIR@/initd-functions
	59
	60	VZQUOTA=@SBINDIR@/vzquota
	61	-CONFIG_DIR=@PKGCONFDIR@/conf
	62	+CONFIG_DIR=@VPSCONFDIR@
	63	LOCKFILE=$VARLOCK/vz_lock
	64	SUBSYS_VZ=$VARLOCK/vz
	65	VESTAT=/proc/vz/vestat