[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, experimental, updated. debian/3.0.9-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 61487cc449f359ec2ce3e46a008578f49e99e22f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Mar 10 22:28:35 2010 +0100

    New patch 0003-Don-t-rely-on-chkconfig-and-check-for-network-manage.patch
    
    Don't rely on chkconfig and check for network-manager

diff --git a/debian/patches/0003-Don-t-rely-on-chkconfig-and-check-for-network-manage.patch b/debian/patches/0003-Don-t-rely-on-chkconfig-and-check-for-network-manage.patch
new file mode 100644
index 0000000..5725c77
--- /dev/null
+++ b/debian/patches/0003-Don-t-rely-on-chkconfig-and-check-for-network-manage.patch
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 10 Mar 2010 22:24:42 +0100
+Subject: [PATCH] Don't rely on chkconfig and check for network-manager
+
+as it's called on Debian based distros.
+---
+ cman/init.d/cman.in |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
+index dc98cfd..8335c2b 100644
+--- a/cman/init.d/cman.in
++++ b/cman/init.d/cman.in
+@@ -295,9 +295,14 @@ sshd_enabled()
+ 
+ network_manager_enabled()
+ {
++	if type chkconfig >/dev/null 2>&1 && chkconfig NetworkManager; then
++		errmsg="\nNetwork Manager is configured to run. Please disable it in the cluster."
++		return 1
++	fi
++
+ 	if status NetworkManager > /dev/null 2>&1 || \
+-	   chkconfig NetworkManager; then
+-		errmsg="\nNetwork Manager is either running or configured to run. Please disable it in the cluster."
++	   status network-manager > /dev/null; then
++		errmsg="\nNetwork Manager is running. Please disable it in the cluster."
+ 		return 1
+ 	fi
+ 	return 0
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 8e29619..dcce188 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-add-dlm-kernel-headers.patch
 0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
+0003-Don-t-rely-on-chkconfig-and-check-for-network-manage.patch

-- 
cluster suite Debian packaging