debian/patches/fix-config-path.diff

   1 Index: new/include/types.h
   2 ===================================================================
   3 --- new.orig/include/types.h    2012-09-28 09:05:45.000000000 +0200
   4 +++ new/include/types.h 2012-09-28 09:41:31.000000000 +0200
   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 DIST_DIR               VZ_DIR "dists"
  12  #define VENAME_DIR             VZ_DIR "names"
  13
  14 Index: new/paths.am
  15 ===================================================================
  16 --- new.orig/paths.am   2012-09-28 09:38:39.000000000 +0200
  17 +++ new/paths.am        2012-09-28 09:39:27.000000000 +0200
  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/etc/init.d/vz-redhat.in
  28 ===================================================================
  29 --- new.orig/etc/init.d/vz-redhat.in    2012-09-28 09:05:45.000000000 +0200
  30 +++ new/etc/init.d/vz-redhat.in 2012-09-28 09:39:27.000000000 +0200
  31 @@ -41,7 +41,7 @@
  32  . @SCRIPTDIR@/initd-functions
  33
  34  VZQUOTA=@SBINDIR@/vzquota
  35 -CONFIG_DIR=@PKGCONFDIR@/conf
  36 +CONFIG_DIR=@VPSCONFDIR@
  37  LOCKFILE=$VARLOCK/vz_lock
  38  SUBSYS_VZ=$VARLOCK/vz
  39  VESTAT=/proc/vz/vestat