[pve-devel] r5883 - in vzctl/trunk: . debian debian/patches
svn-commits at proxmox.com
svn-commits at proxmox.com
Mon May 2 07:30:26 CEST 2011
Author: dietmar
Date: 2011-05-02 07:30:25 +0200 (Mon, 02 May 2011)
New Revision: 5883
Modified:
vzctl/trunk/Makefile
vzctl/trunk/debian/changelog
vzctl/trunk/debian/patches/fix-configure.patch
vzctl/trunk/debian/patches/fix-init-script.patch
vzctl/trunk/debian/patches/initlog.patch
vzctl/trunk/debian/patches/series
vzctl/trunk/debian/rules
vzctl/trunk/debian/vzctl.postinst
vzctl/trunk/debian/vzctl.postrm
Log:
update to 3.0.26
Modified: vzctl/trunk/Makefile
===================================================================
--- vzctl/trunk/Makefile 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/Makefile 2011-05-02 05:30:25 UTC (rev 5883)
@@ -1,14 +1,14 @@
-RELEASE=1.6
+RELEASE=1.9
-SVER=3.0.24
-PACKAGERELEASE=1pve4
+SVER=3.0.26
+PACKAGERELEASE=1pve1
ARCH=amd64
PACKAGE=vzctl
DEB=${PACKAGE}_${SVER}-${PACKAGERELEASE}_${ARCH}.deb
-# Fri, 27 Aug 2010 15:23:50 +0000 (19:23 +0400)
-VZCTL_BRANCH=7d5ba92543ee16ed0e2ae87bc65696cf054254c3
+# Wed, 27 Apr 2011 13:30:45
+VZCTL_BRANCH=1a8312b9c5d72ef70e73185912e464fb633dd9b8
all: ${DEB}
Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/changelog 2011-05-02 05:30:25 UTC (rev 5883)
@@ -1,3 +1,9 @@
+vzctl (3.0.26-1pve1) unstable; urgency=low
+
+ * update to latest available version fromn git (Wed, 27 Apr 2011)
+
+ -- Proxmox Support Team <support at proxmox.com> Mon, 02 May 2011 06:50:16 +0200
+
vzctl (3.0.24-1pve4) unstable; urgency=low
* fix bug in list2str (fix-list2str.patch)
Modified: vzctl/trunk/debian/patches/fix-configure.patch
===================================================================
--- vzctl/trunk/debian/patches/fix-configure.patch 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/patches/fix-configure.patch 2011-05-02 05:30:25 UTC (rev 5883)
@@ -1,7 +1,7 @@
-Index: vzctlnew/configure.ac
+Index: src/configure.ac
===================================================================
---- vzctlnew.orig/configure.ac 2010-08-06 11:38:20.000000000 +0200
-+++ vzctlnew/configure.ac 2010-08-06 11:38:25.000000000 +0200
+--- src.orig/configure.ac 2011-05-02 06:28:10.000000000 +0200
++++ src/configure.ac 2011-05-02 06:28:26.000000000 +0200
@@ -51,6 +51,8 @@
AC_PROG_LIBTOOL
AC_PROG_INSTALL
Modified: vzctl/trunk/debian/patches/fix-init-script.patch
===================================================================
--- vzctl/trunk/debian/patches/fix-init-script.patch 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/patches/fix-init-script.patch 2011-05-02 05:30:25 UTC (rev 5883)
@@ -1,8 +1,8 @@
-Index: vzctlnew/etc/init.d/vz-redhat.in
+Index: src/etc/init.d/vz-redhat.in
===================================================================
---- vzctlnew.orig/etc/init.d/vz-redhat.in 2010-08-06 11:39:32.000000000 +0200
-+++ vzctlnew/etc/init.d/vz-redhat.in 2010-08-06 11:39:41.000000000 +0200
-@@ -185,8 +185,8 @@
+--- src.orig/etc/init.d/vz-redhat.in 2011-05-02 06:28:04.000000000 +0200
++++ src/etc/init.d/vz-redhat.in 2011-05-02 06:28:29.000000000 +0200
+@@ -81,8 +81,8 @@
check_kernel()
{
if ! test -d /proc/vz ; then
Modified: vzctl/trunk/debian/patches/initlog.patch
===================================================================
--- vzctl/trunk/debian/patches/initlog.patch 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/patches/initlog.patch 2011-05-02 05:30:25 UTC (rev 5883)
@@ -1,7 +1,7 @@
-Index: vzctlnew/etc/vz.conf
+Index: src/etc/vz.conf
===================================================================
---- vzctlnew.orig/etc/vz.conf 2010-08-06 11:34:48.000000000 +0200
-+++ vzctlnew/etc/vz.conf 2010-08-06 11:36:10.000000000 +0200
+--- src.orig/etc/vz.conf 2011-05-02 06:28:16.000000000 +0200
++++ src/etc/vz.conf 2011-05-02 06:28:21.000000000 +0200
@@ -10,6 +10,9 @@
LOG_LEVEL=0
VERBOSE=0
@@ -12,11 +12,11 @@
## Disk quota parameters
DISK_QUOTA=yes
VZFASTBOOT=no
-Index: vzctlnew/include/res.h
+Index: src/include/res.h
===================================================================
---- vzctlnew.orig/include/res.h 2010-08-06 11:35:05.000000000 +0200
-+++ vzctlnew/include/res.h 2010-08-06 11:36:10.000000000 +0200
-@@ -55,6 +55,7 @@
+--- src.orig/include/res.h 2011-05-02 06:28:16.000000000 +0200
++++ src/include/res.h 2011-05-02 06:28:21.000000000 +0200
+@@ -57,6 +57,7 @@
int onboot;
unsigned long *bootorder;
int wait;
@@ -24,22 +24,22 @@
} misc_param;
struct mod_action;
-Index: vzctlnew/include/vzctl_param.h
+Index: src/include/vzctl_param.h
===================================================================
---- vzctlnew.orig/include/vzctl_param.h 2010-08-06 11:35:15.000000000 +0200
-+++ vzctlnew/include/vzctl_param.h 2010-08-06 11:36:10.000000000 +0200
-@@ -132,6 +132,7 @@
- #define PARAM_DESCRIPTION 362
- #define PARAM_SWAPPAGES 363
+--- src.orig/include/vzctl_param.h 2011-05-02 06:28:16.000000000 +0200
++++ src/include/vzctl_param.h 2011-05-02 06:28:21.000000000 +0200
+@@ -135,6 +135,7 @@
#define PARAM_BOOTORDER 364
-+#define PARAM_INITLOG 365
+ #define PARAM_PCI_ADD 365
+ #define PARAM_PCI_DEL 366
++#define PARAM_INITLOG 367
#define PARAM_LINE "e:p:f:t:i:l:k:a:b:n:x:h"
#endif
-Index: vzctlnew/man/ctid.conf.5
+Index: src/man/ctid.conf.5
===================================================================
---- vzctlnew.orig/man/ctid.conf.5 2010-08-06 11:35:29.000000000 +0200
-+++ vzctlnew/man/ctid.conf.5 2010-08-06 11:37:13.000000000 +0200
+--- src.orig/man/ctid.conf.5 2011-05-02 06:28:16.000000000 +0200
++++ src/man/ctid.conf.5 2011-05-02 06:28:21.000000000 +0200
@@ -28,6 +28,13 @@
Default is \fBno\fR, meaning the container will not be started
if \fBONBOOT\fR parameter is omitted.
@@ -54,10 +54,10 @@
.IP \fBBOOTORDER\fR="\fInumber\fR"
Specifies the CT boot order priority. Corresponds to the
\fB--bootorder\fR option.
-Index: vzctlnew/scripts/Makefile.am
+Index: src/scripts/Makefile.am
===================================================================
---- vzctlnew.orig/scripts/Makefile.am 2010-08-06 11:34:31.000000000 +0200
-+++ vzctlnew/scripts/Makefile.am 2010-08-06 11:44:18.000000000 +0200
+--- src.orig/scripts/Makefile.am 2011-05-02 06:28:16.000000000 +0200
++++ src/scripts/Makefile.am 2011-05-02 06:28:21.000000000 +0200
@@ -17,7 +17,11 @@
include $(top_srcdir)/pathsubst.am
@@ -70,11 +70,11 @@
vps-create \
vps-functions \
vps-net_add \
-Index: vzctlnew/src/lib/config.c
+Index: src/src/lib/config.c
===================================================================
---- vzctlnew.orig/src/lib/config.c 2010-08-06 11:34:00.000000000 +0200
-+++ vzctlnew/src/lib/config.c 2010-08-06 11:36:10.000000000 +0200
-@@ -60,6 +60,7 @@
+--- src.orig/src/lib/config.c 2011-05-02 06:28:16.000000000 +0200
++++ src/src/lib/config.c 2011-05-02 06:28:21.000000000 +0200
+@@ -61,6 +61,7 @@
{"LOG_LEVEL", NULL, PARAM_LOGLEVEL},
{"LOGFILE", NULL, PARAM_LOGFILE},
{"VERBOSE", NULL, PARAM_VERBOSE},
@@ -82,16 +82,16 @@
{"IPTABLES", NULL, PARAM_IPTABLES},
/* UB */
-@@ -116,6 +117,8 @@
- {"CPUUWEIGHT", NULL, PARAM_CPUWEIGHT},
+@@ -120,6 +121,8 @@
{"CPULIMIT", NULL, PARAM_CPULIMIT},
{"CPUS", NULL, PARAM_VCPUS},
+ {"CPUMASK", NULL, PARAM_CPUMASK},
+/* misc param */
+{"INITLOG", NULL, PARAM_INITLOG},
/* create param */
{"ONBOOT", NULL, PARAM_ONBOOT},
{"CONFIGFILE", NULL, PARAM_CONFIG},
-@@ -1104,6 +1107,9 @@
+@@ -1244,6 +1247,9 @@
ret = 0;
switch (conf->id) {
@@ -101,7 +101,7 @@
case PARAM_ONBOOT:
ret = conf_store_yesno(conf_h, conf->name, misc->onboot);
break;
-@@ -1704,6 +1710,9 @@
+@@ -1858,6 +1864,9 @@
case PARAM_LOGGING:
ret = conf_parse_yesno(&vps_p->log.enable, val);
break;
@@ -111,7 +111,7 @@
case PARAM_LOGLEVEL:
if (parse_int(val, &int_id))
break;
-@@ -2502,6 +2511,7 @@
+@@ -2660,6 +2669,7 @@
MERGE_INT(onboot)
MERGE_P(bootorder)
MERGE_INT(wait)
@@ -119,10 +119,10 @@
}
static void merge_dq(dq_param *dst, dq_param *src)
-Index: vzctlnew/src/lib/env.c
+Index: src/src/lib/env.c
===================================================================
---- vzctlnew.orig/src/lib/env.c 2010-08-06 11:33:37.000000000 +0200
-+++ vzctlnew/src/lib/env.c 2010-08-06 11:36:56.000000000 +0200
+--- src.orig/src/lib/env.c 2011-05-02 06:28:16.000000000 +0200
++++ src/src/lib/env.c 2011-05-02 06:28:21.000000000 +0200
@@ -23,6 +23,7 @@
#include <signal.h>
#include <fcntl.h>
@@ -131,7 +131,7 @@
#include <sys/wait.h>
#include <string.h>
#include <grp.h>
-@@ -280,7 +281,7 @@
+@@ -305,7 +306,7 @@
int fd, ret;
vps_res *res;
char *argv[] = {"init", "-z", " ", NULL};
@@ -140,9 +140,9 @@
res = (vps_res *) data;
memset(&create_param, 0, sizeof(create_param));
-@@ -382,12 +383,65 @@
+@@ -412,12 +413,65 @@
*/
- if (read(wait_p, &ret, sizeof(ret)) != 0)
+ if (read(wait_p, &ret, sizeof(ret)) == 0)
return 0;
- if ((fd = open("/dev/null", O_RDWR)) != -1) {
- dup2(fd, 0);
@@ -211,7 +211,7 @@
execve("/sbin/init", argv, envp);
execve("/etc/init", argv, envp);
execve("/bin/init", argv, envp);
-@@ -403,6 +457,20 @@
+@@ -433,6 +487,20 @@
{
int ret, pid;
@@ -232,10 +232,10 @@
if ((ret = vz_chroot(res->fs.root)))
return ret;
if ((ret = vz_setluid(veid)))
-Index: vzctlnew/scripts/init-logger.c
+Index: src/scripts/init-logger.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vzctlnew/scripts/init-logger.c 2010-08-06 11:45:28.000000000 +0200
++++ src/scripts/init-logger.c 2011-05-02 06:28:21.000000000 +0200
@@ -0,0 +1,163 @@
+/*
+
Modified: vzctl/trunk/debian/patches/series
===================================================================
--- vzctl/trunk/debian/patches/series 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/patches/series 2011-05-02 05:30:25 UTC (rev 5883)
@@ -1,4 +1,3 @@
initlog.patch
-fix-list2str.patch
fix-configure.patch
fix-init-script.patch
Modified: vzctl/trunk/debian/rules
===================================================================
--- vzctl/trunk/debian/rules 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/rules 2011-05-02 05:30:25 UTC (rev 5883)
@@ -62,7 +62,7 @@
# debianize vz.conf
sed -i \
-e 's/\/vz\//\/var\/lib\/vz\//' \
- -e s/fedora-core-4/debian-$(OS_DEB_VERSION)-$(DEB_BUILD_ARCH)-minimal/g \
+ -e s/centos-5/debian-$(OS_DEB_VERSION)-$(DEB_BUILD_ARCH)-minimal/g \
$(CURDIR)/debian/vzctl/etc/vz/vz.conf
# set default dist-script to debian
@@ -71,9 +71,7 @@
# rename the bash_completion.d/vzctl.sh for debian to vzctl
mv $(CURDIR)/debian/vzctl/etc/bash_completion.d/vzctl.sh $(CURDIR)/debian/vzctl/etc/bash_completion.d/vzctl
- # set correct permision to etc/vz/cron/vz, make lintian happy
- chmod -x $(CURDIR)/debian/vzctl/etc/vz/cron/vz
-
+
# Remove unused file from libtool
rm -rf $(CURDIR)/debian/vzctl/usr/lib/*.la
rm -rf $(CURDIR)/debian/vzctl/usr/lib/*.a
Modified: vzctl/trunk/debian/vzctl.postinst
===================================================================
--- vzctl/trunk/debian/vzctl.postinst 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/vzctl.postinst 2011-05-02 05:30:25 UTC (rev 5883)
@@ -26,6 +26,15 @@
/sbin/sysctl -q -p /etc/sysctl.d/vzctl.conf
fi
+ if [ -x "/etc/init.d/vzeventd" ]; then
+ update-rc.d vzeventd defaults >/dev/null
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d vzeventd start || exit $?
+ else
+ /etc/init.d/vzeventd start || exit $?
+ fi
+ fi
+
if [ -x "/etc/init.d/vz" ]; then
update-rc.d vz defaults >/dev/null
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
@@ -35,13 +44,6 @@
fi
fi
- # cron handle by vz init.d script itself
- export LANG=C
- if [ -x /usr/sbin/invoke-rc.d ] ; then
- invoke-rc.d vz update-cron > /dev/null || true
- else
- /etc/init.d/vz update-cron > /dev/null || true
- fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: vzctl/trunk/debian/vzctl.postrm
===================================================================
--- vzctl/trunk/debian/vzctl.postrm 2011-04-28 15:35:27 UTC (rev 5882)
+++ vzctl/trunk/debian/vzctl.postrm 2011-05-02 05:30:25 UTC (rev 5883)
@@ -20,6 +20,7 @@
case "$1" in
purge)
update-rc.d -f vz remove >/dev/null
+ update-rc.d -f vzeventd remove >/dev/null
# purge ve-configs
rm -rf \
/etc/vz/conf \
More information about the pve-devel
mailing list