[pve-devel] r4929 - in vzctl/trunk: . debian

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Aug 5 10:46:19 CEST 2010


Author: dietmar
Date: 2010-08-05 08:46:19 +0000 (Thu, 05 Aug 2010)
New Revision: 4929

Modified:
   vzctl/trunk/Makefile
   vzctl/trunk/debian/changelog
   vzctl/trunk/vzctl.diff
Log:
upgrade to latest version


Modified: vzctl/trunk/Makefile
===================================================================
--- vzctl/trunk/Makefile	2010-08-04 11:13:05 UTC (rev 4928)
+++ vzctl/trunk/Makefile	2010-08-05 08:46:19 UTC (rev 4929)
@@ -1,7 +1,7 @@
-RELEASE=1.5
+RELEASE=1.6
 
-SVER=3.0.23
-PACKAGERELEASE=1pve11
+SVER=3.0.24
+PACKAGERELEASE=1pve1
 ARCH=amd64
 
 PACKAGE=vzctl
@@ -10,7 +10,9 @@
 # Fri, 22 Jan 2010 16:39:56 +0000
 #VZCTL_BRANCH=346b5152e255b473588a870ec081f9edaba6a786
 # Thu Apr 22 14:39:01 2010 -0700
-VZCTL_BRANCH=43b15e82d4d492415ca0f8c0e8bdc3fae6a5e94a
+#VZCTL_BRANCH=43b15e82d4d492415ca0f8c0e8bdc3fae6a5e94a
+# Fri, 23 Jul 2010 21:02:51 +0000 (01:02 +0400)
+VZCTL_BRANCH=da3a3669e182092b50a6e6a428da8620e69a0de9
 
 all: ${DEB}
 
@@ -45,7 +47,7 @@
 ${DEB}: vzctl-${SVER}/debian/control init-logger
 	chmod +x vzctl-${SVER}/debian/rules
 	cp init-logger vzctl-${SVER}/scripts
-	cd vzctl-${SVER}; dpkg-buildpackage -rfakeroot -us -uc
+	cd vzctl-${SVER}; dpkg-buildpackage -b -rfakeroot -us -uc
 
 hostname.diff:
 	-diff -r -u vzctl-${SVER}.org/etc/dists/scripts/debian-set_hostname.sh vzctl-${SVER}/etc/dists/scripts/debian-set_hostname.sh > $@
@@ -64,7 +66,7 @@
 	-diff -r -u vzctl-${SVER}.org/include/res.h vzctl-${SVER}/include/res.h >> $@
 	-diff -r -u vzctl-${SVER}.org/include/vzctl_param.h vzctl-${SVER}/include/vzctl_param.h >> $@
 	-diff -r -u vzctl-${SVER}.org/vzctl.spec vzctl-${SVER}/vzctl.spec >> $@
-	-diff -r -u vzctl-${SVER}.org/man/vps.conf.5 vzctl-${SVER}/man/vps.conf.5 >> $@
+	-diff -r -u vzctl-${SVER}.org/man/ctid.conf.5 vzctl-${SVER}/man/ctid.conf.5 >> $@
 
 pwhack.diff:
 	-diff -r -u vzctl-${SVER}/src/lib/create.c nvzctl-${SVER}/src/lib/create.c > $@

Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2010-08-04 11:13:05 UTC (rev 4928)
+++ vzctl/trunk/debian/changelog	2010-08-05 08:46:19 UTC (rev 4929)
@@ -1,3 +1,9 @@
+vzctl (3.0.24-1pve1) unstable; urgency=low
+
+  * upgrade to latest version from git
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 05 Aug 2010 10:43:16 +0200
+
 vzctl (3.0.23-1pve11) unstable; urgency=low
 
   * fix bug in vzgetnetdev (revert recent change). See OpenVZ Bug #1506

Modified: vzctl/trunk/vzctl.diff
===================================================================
--- vzctl/trunk/vzctl.diff	2010-08-04 11:13:05 UTC (rev 4928)
+++ vzctl/trunk/vzctl.diff	2010-08-05 08:46:19 UTC (rev 4929)
@@ -1,5 +1,5 @@
---- vzctl-3.0.23.org/src/lib/env.c	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/src/lib/env.c	2010-01-07 11:07:47.000000000 +0100
+--- vzctl-3.0.24.org/src/lib/env.c	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/src/lib/env.c	2010-08-05 10:28:51.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <signal.h>
  #include <fcntl.h>
@@ -8,7 +8,7 @@
  #include <sys/wait.h>
  #include <string.h>
  #include <grp.h>
-@@ -307,7 +308,7 @@
+@@ -280,7 +281,7 @@
  	int fd, ret;
  	vps_res *res;
  	char *argv[] = {"init", "-z", "      ", NULL};
@@ -17,7 +17,7 @@
  
  	res = (vps_res *) data;
  	memset(&create_param, 0, sizeof(create_param));
-@@ -395,12 +396,65 @@
+@@ -382,12 +383,65 @@
  	*/
  	if (read(wait_p, &ret, sizeof(ret)) != 0)
  		return 0;
@@ -88,7 +88,7 @@
  	execve("/sbin/init", argv, envp);
  	execve("/etc/init", argv, envp);
  	execve("/bin/init", argv, envp);
-@@ -416,6 +470,20 @@
+@@ -403,6 +457,20 @@
  {
  	int ret, pid;
  
@@ -109,8 +109,8 @@
  	if ((ret = vz_chroot(res->fs.root)))
  		return ret;
  	if ((ret = vz_setluid(veid)))
---- vzctl-3.0.23.org/src/lib/config.c	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/src/lib/config.c	2010-01-07 10:37:44.000000000 +0100
+--- vzctl-3.0.24.org/src/lib/config.c	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/src/lib/config.c	2010-08-05 10:33:49.000000000 +0200
 @@ -60,6 +60,7 @@
  {"LOG_LEVEL",	NULL, PARAM_LOGLEVEL},
  {"LOGFILE",	NULL, PARAM_LOGFILE},
@@ -119,16 +119,16 @@
  
  {"IPTABLES",	NULL, PARAM_IPTABLES},
  /*	UB	*/
-@@ -199,6 +200,8 @@
- {"cpuweight",	required_argument, NULL, PARAM_CPUWEIGHT},
- {"cpulimit",	required_argument, NULL, PARAM_CPULIMIT},
- {"cpus",	required_argument, NULL, PARAM_VCPUS},
+@@ -116,6 +117,8 @@
+ {"CPUUWEIGHT",	NULL, PARAM_CPUWEIGHT},
+ {"CPULIMIT",	NULL, PARAM_CPULIMIT},
+ {"CPUS",	NULL, PARAM_VCPUS},
 +/*      misc param     */
-+{"initlog",	required_argument, NULL, PARAM_INITLOG},
- /*	create param	*/
- {"onboot",	required_argument, NULL, PARAM_ONBOOT},
- {"setmode",	required_argument, NULL, PARAM_SETMODE},
-@@ -1199,6 +1202,9 @@
++{"INITLOG",	NULL, PARAM_INITLOG},
+ /* create param	*/
+ {"ONBOOT",	NULL, PARAM_ONBOOT},
+ {"CONFIGFILE",	NULL, PARAM_CONFIG},
+@@ -1104,6 +1107,9 @@
  
  	ret = 0;
  	switch (conf->id) {
@@ -138,7 +138,7 @@
  	case PARAM_ONBOOT:
  		ret = conf_store_yesno(conf_h, conf->name, misc->onboot);
  		break;
-@@ -1878,6 +1884,9 @@
+@@ -1704,6 +1710,9 @@
  	case PARAM_LOGGING:
  		ret = conf_parse_yesno(&vps_p->log.enable, val);
  		break;
@@ -148,7 +148,7 @@
  	case PARAM_LOGLEVEL:
  		if (parse_int(val, &int_id))
  			break;
-@@ -2698,6 +2707,7 @@
+@@ -2502,6 +2511,7 @@
  	MERGE_INT(onboot)
  	MERGE_P(bootorder)
  	MERGE_INT(wait)
@@ -156,8 +156,8 @@
  }
  
  static void merge_dq(dq_param *dst, dq_param *src)
---- vzctl-3.0.23.org/scripts/Makefile.am	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/scripts/Makefile.am	2010-01-07 10:37:44.000000000 +0100
+--- vzctl-3.0.24.org/scripts/Makefile.am	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/scripts/Makefile.am	2010-08-05 10:28:51.000000000 +0200
 @@ -18,6 +18,7 @@
  include $(top_srcdir)/pathsubst.am
  
@@ -166,8 +166,8 @@
  	vps-create \
  	vps-functions \
  	vps-net_add \
---- vzctl-3.0.23.org/etc/vz.conf	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/etc/vz.conf	2010-01-07 10:37:44.000000000 +0100
+--- vzctl-3.0.24.org/etc/vz.conf	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/etc/vz.conf	2010-08-05 10:28:51.000000000 +0200
 @@ -10,6 +10,9 @@
  LOG_LEVEL=0
  VERBOSE=0
@@ -178,8 +178,8 @@
  ## Disk quota parameters
  DISK_QUOTA=yes
  VZFASTBOOT=no
---- vzctl-3.0.23.org/include/res.h	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/include/res.h	2010-01-07 10:37:44.000000000 +0100
+--- vzctl-3.0.24.org/include/res.h	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/include/res.h	2010-08-05 10:28:51.000000000 +0200
 @@ -55,6 +55,7 @@
  	int onboot;
  	unsigned long *bootorder;
@@ -188,9 +188,9 @@
  } misc_param;
  
  struct mod_action;
---- vzctl-3.0.23.org/include/vzctl_param.h	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/include/vzctl_param.h	2010-01-07 10:37:44.000000000 +0100
-@@ -136,6 +136,7 @@
+--- vzctl-3.0.24.org/include/vzctl_param.h	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/include/vzctl_param.h	2010-08-05 10:28:51.000000000 +0200
+@@ -132,6 +132,7 @@
  #define PARAM_DESCRIPTION	362
  #define PARAM_SWAPPAGES		363
  #define PARAM_BOOTORDER		364
@@ -198,8 +198,8 @@
  
  #define PARAM_LINE		"e:p:f:t:i:l:k:a:b:n:x:h"
  #endif
---- vzctl-3.0.23.org/man/ctid.conf.5	2010-01-04 12:55:10.000000000 +0100
-+++ vzctl-3.0.23/man/ctid.conf.5	2010-01-07 10:37:44.000000000 +0100
+--- vzctl-3.0.24.org/man/ctid.conf.5	2010-08-05 10:28:51.000000000 +0200
++++ vzctl-3.0.24/man/ctid.conf.5	2010-08-05 10:28:51.000000000 +0200
 @@ -28,6 +28,13 @@
  Default is \fBno\fR, meaning the container will not be started
  if \fBONBOOT\fR parameter is omitted.



More information about the pve-devel mailing list