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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-30 07:01:28 +0200 (Mon, 30 May 2011)
New Revision: 6036

Modified:
   vzctl/trunk/Makefile
   vzctl/trunk/debian/changelog
   vzctl/trunk/debian/patches/fix-vzevent-init.patch
Log:


Modified: vzctl/trunk/Makefile
===================================================================
--- vzctl/trunk/Makefile	2011-05-30 04:48:00 UTC (rev 6035)
+++ vzctl/trunk/Makefile	2011-05-30 05:01:28 UTC (rev 6036)
@@ -1,14 +1,14 @@
 RELEASE=1.8
 
-SVER=3.0.26
-PACKAGERELEASE=1pve3
+SVER=3.0.27
+PACKAGERELEASE=1pve1
 ARCH=amd64
 
 PACKAGE=vzctl
 DEB=${PACKAGE}_${SVER}-${PACKAGERELEASE}_${ARCH}.deb
 
-# Sat, 7 May 2011 19:57:49
-VZCTL_BRANCH=vzctl-3.0.26.3
+# Wed, 25 May 2011 19:16:12
+VZCTL_BRANCH=vzctl-3.0.27
 
 all: ${DEB}
 

Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2011-05-30 04:48:00 UTC (rev 6035)
+++ vzctl/trunk/debian/changelog	2011-05-30 05:01:28 UTC (rev 6036)
@@ -1,3 +1,16 @@
+vzctl (3.0.26-1pve5) unstable; urgency=low
+
+  * update to upstream vzctl-3.0.27
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 30 May 2011 07:00:57 +0200
+
+vzctl (3.0.26-1pve4) unstable; urgency=low
+
+  * ignore vzeventd module load errors (avoid problems when updating
+    kernel)
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 10 May 2011 11:08:07 +0200
+
 vzctl (3.0.26-1pve3) unstable; urgency=low
 
   * update to vzctl-3.0.26.3 release

Modified: vzctl/trunk/debian/patches/fix-vzevent-init.patch
===================================================================
--- vzctl/trunk/debian/patches/fix-vzevent-init.patch	2011-05-30 04:48:00 UTC (rev 6035)
+++ vzctl/trunk/debian/patches/fix-vzevent-init.patch	2011-05-30 05:01:28 UTC (rev 6036)
@@ -1,7 +1,7 @@
 Index: src/etc/init.d/vzeventd-redhat.in
 ===================================================================
---- src.orig/etc/init.d/vzeventd-redhat.in	2011-05-02 12:35:16.000000000 +0200
-+++ src/etc/init.d/vzeventd-redhat.in	2011-05-02 12:37:12.000000000 +0200
+--- src.orig/etc/init.d/vzeventd-redhat.in	2011-05-09 09:32:32.000000000 +0200
++++ src/etc/init.d/vzeventd-redhat.in	2011-05-10 11:06:30.000000000 +0200
 @@ -27,6 +27,11 @@
  prog=vzeventd
  lockfile=$VARLOCK/$prog
@@ -14,3 +14,12 @@
  load_module() {
  	modprobe vzevent reboot_event=1
  }
+@@ -60,7 +65,7 @@
+ 	[ -f $lockfile ] && exit 0 # Already running
+ 
+ 	load_module
+-	check || exit 1
++	check || exit 0
+ 
+ 	echo -n $"Starting $prog: "
+ 	vzdaemon_start $prog $OPTIONS