[Cluster-devel] cluster/cman/init.d cman
rmccabe at sourceware.org
rmccabe at sourceware.org
Thu May 10 14:36:21 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rmccabe at sourceware.org 2007-05-10 14:36:21
Modified files:
cman/init.d : cman
Log message:
don't try to workaround xend networking when running on a non-xen kernel
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/cman.diff?cvsroot=cluster&r1=1.30&r2=1.31
--- cluster/cman/init.d/cman 2007/04/27 15:07:10 1.30
+++ cluster/cman/init.d/cman 2007/05/10 14:36:19 1.31
@@ -133,6 +133,9 @@
}
xend_bridged_net_enabled() {
+ # Not a xen kernel
+ test -d /proc/xen || return 1
+
current_runlevel=$(/sbin/runlevel 2>/dev/null | awk '{ print $2 }' 2>/dev/null)
if [ -z "$current_runlevel" ]; then
errmsg='Unable to determine the current runlevel'
@@ -150,7 +153,7 @@
return 1
fi
- egrep "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp 2>/dev/null
+ egrep "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp >/dev/null 2>/dev/null
if [ $? -ne 0 ]; then
# xend isn't configured to use bridged networking.
return 1
More information about the Cluster-devel
mailing list