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 \