Attachment 295802 Details for Bug 434790 – /etc/rc.d/init.d/cman patch

[patch] /etc/rc.d/init.d/cman patch

cman.diff (text/plain), 1.12 KB, created by Davide Benini on 2008-02-25 14:58:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Davide Benini

Created: 2008-02-25 14:58:39 UTC

Size: 1.12 KB

patch

obsolete

>--- cman.ORI	2007-10-16 19:05:28.000000000 +0200
>+++ cman	2008-02-22 15:01:29.000000000 +0100
>@@ -153,7 +153,7 @@
>         return 1
>     fi
> 
>-    egrep "^[[:blank:]]*$[[:blank:]]*network-script[[:blank:]]+network-bridge([[:blank:]]*$|[[:blank:]]+)" /etc/xen/xend-config.sxp >/dev/null 2>/dev/null
>+    egrep "^[[:blank:]]*$[[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*network-bridge([[:blank:]]*$|[[:blank:]]+)" /etc/xen/xend-config.sxp >&/dev/null
>     if [ $? -ne 0 ]; then
>         # xend isn't configured to use bridged networking.
>         return 1
>@@ -173,7 +173,8 @@
> 
>     /sbin/modprobe netbk >& /dev/null
>     /sbin/modprobe netloop >& /dev/null
>-    errmsg=$(/etc/xen/scripts/network-bridge start 2>&1) || return 1
>+    bridge_parms=`egrep -m 1 "^[[:blank:]]*$[[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*network-bridge([[:blank:]]*$|[[:blank:]]+)" /etc/xen/xend-config.sxp| sed -r "s/^[[:blank:]]*$[[:blank:]]*network-script[[:blank:]]+'?[[:blank:]]*network-bridge[[:blank:]]*//; s/'?[[:blank:]]*$.*//"`
>+    errmsg=$(/etc/xen/scripts/network-bridge start $bridge_parms 2>&1) || return 1
>     return 0
> }
>

Actions: View | Diff

Attachments on bug 434790: 295802