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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-30 07:17:00 +0200 (Mon, 30 May 2011)
New Revision: 6037

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


Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2011-05-30 05:01:28 UTC (rev 6036)
+++ vzctl/trunk/debian/changelog	2011-05-30 05:17:00 UTC (rev 6037)
@@ -1,4 +1,4 @@
-vzctl (3.0.26-1pve5) unstable; urgency=low
+vzctl (3.0.27-1pve1) unstable; urgency=low
 
   * update to upstream vzctl-3.0.27
 

Modified: vzctl/trunk/debian/patches/fix-init-script.patch
===================================================================
--- vzctl/trunk/debian/patches/fix-init-script.patch	2011-05-30 05:01:28 UTC (rev 6036)
+++ vzctl/trunk/debian/patches/fix-init-script.patch	2011-05-30 05:17:00 UTC (rev 6037)
@@ -1,14 +1,12 @@
-Index: src/etc/init.d/vz-redhat.in
+Index: new/etc/init.d/initd-functions.in
 ===================================================================
---- 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()
+--- new.orig/etc/init.d/initd-functions.in	2011-05-30 07:08:24.000000000 +0200
++++ new/etc/init.d/initd-functions.in	2011-05-30 07:09:11.000000000 +0200
+@@ -86,7 +86,7 @@
  {
  	if ! test -d /proc/vz ; then
--		print_failure "Running kernel is not OpenVZ kernel."
--		exit 1
-+		print_result "Running kernel is not OpenVZ kernel."
+ 		echo "Running kernel is not an OpenVZ kernel"
+-		exit 6
 +		exit 0
  	fi
  }

Modified: vzctl/trunk/debian/patches/fix-vzevent-init.patch
===================================================================
--- vzctl/trunk/debian/patches/fix-vzevent-init.patch	2011-05-30 05:01:28 UTC (rev 6036)
+++ vzctl/trunk/debian/patches/fix-vzevent-init.patch	2011-05-30 05:17:00 UTC (rev 6037)
@@ -1,7 +1,7 @@
-Index: src/etc/init.d/vzeventd-redhat.in
+Index: new/etc/init.d/vzeventd-redhat.in
 ===================================================================
---- 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
+--- new.orig/etc/init.d/vzeventd-redhat.in	2011-05-30 07:01:38.000000000 +0200
++++ new/etc/init.d/vzeventd-redhat.in	2011-05-30 07:10:19.000000000 +0200
 @@ -27,6 +27,11 @@
  prog=vzeventd
  lockfile=$VARLOCK/$prog
@@ -14,7 +14,7 @@
  load_module() {
  	modprobe vzevent reboot_event=1
  }
-@@ -60,7 +65,7 @@
+@@ -61,7 +66,7 @@
  	[ -f $lockfile ] && exit 0 # Already running
  
  	load_module