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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-02 12:40:31 +0200 (Mon, 02 May 2011)
New Revision: 5889

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


Modified: vzctl/trunk/debian/changelog
===================================================================
--- vzctl/trunk/debian/changelog	2011-05-02 10:20:23 UTC (rev 5888)
+++ vzctl/trunk/debian/changelog	2011-05-02 10:40:31 UTC (rev 5889)
@@ -1,6 +1,8 @@
 vzctl (3.0.26-1pve2) unstable; urgency=low
 
   * remove stale cron scripts
+  
+  * fix /etc/init.d/vzeventd - do not fail on non-openvz kernels
 
  -- Proxmox Support Team <support at proxmox.com>  Mon, 02 May 2011 12:12:44 +0200
 

Added: vzctl/trunk/debian/patches/fix-vzevent-init.patch
===================================================================
--- vzctl/trunk/debian/patches/fix-vzevent-init.patch	                        (rev 0)
+++ vzctl/trunk/debian/patches/fix-vzevent-init.patch	2011-05-02 10:40:31 UTC (rev 5889)
@@ -0,0 +1,16 @@
+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
+@@ -27,6 +27,11 @@
+ prog=vzeventd
+ lockfile=$VARLOCK/$prog
+ 
++if ! test -d /proc/vz ; then
++    # NOTE: Running kernel is not OpenVZ kernel.
++    exit 0
++fi
++
+ load_module() {
+ 	modprobe vzevent reboot_event=1
+ }

Modified: vzctl/trunk/debian/patches/series
===================================================================
--- vzctl/trunk/debian/patches/series	2011-05-02 10:20:23 UTC (rev 5888)
+++ vzctl/trunk/debian/patches/series	2011-05-02 10:40:31 UTC (rev 5889)
@@ -1,3 +1,4 @@
 initlog.patch
 fix-configure.patch
 fix-init-script.patch
+fix-vzevent-init.patch