debian/patches/fix-config-path.diff

   1 Index: new/include/types.h
   2 ===================================================================
   3 --- new.orig/include/types.h    2011-11-17 08:05:21.000000000 +0100
   4 +++ new/include/types.h 2011-11-17 08:05:45.000000000 +0100
   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 ===================================================================
  16 --- new.orig/paths.am   2011-11-17 08:05:21.000000000 +0100
  17 +++ new/paths.am        2011-11-17 08:05:45.000000000 +0100
  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
  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/etc/init.d/vz-redhat.in
  41 ===================================================================
  42 --- new.orig/etc/init.d/vz-redhat.in    2011-11-17 08:06:26.000000000 +0100
  43 +++ new/etc/init.d/vz-redhat.in 2011-11-17 08:07:06.000000000 +0100
  44 @@ -41,7 +41,7 @@
  45  . @VZLIBDIR@/initd-functions
  46
  47  VZQUOTA=@SBINDIR@/vzquota
  48 -CONFIG_DIR=@PKGCONFDIR@/conf
  49 +CONFIG_DIR=@VPSCONFDIR@
  50  LOCKFILE=$VARLOCK/vz_lock
  51  SUBSYS_VZ=$VARLOCK/vz
  52  VESTAT=/proc/vz/vestat