[ovs-dev] [suse 6/7] xenserver: Add defaults for ENABLE_BRCOMPAT, ENABLE_FAKE_PROC_NET.

[Justin Pettit]

Do we expect that the general case is that we want to enable bridge compatibility?

--Justin


On Dec 15, 2010, at 11:19 AM, Ben Pfaff wrote:

> From: Patrick Mullaney <pm.mullaney at gmail.com>
> 
> On non-XenServer systems there is no $PRODUCT_VERSION to test for default
> behavior, so use reasonable defaults in that case.
> 
> Signed-off-by: Patrick Mullaney <pm.mullaney at gmail.com>
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
> xenserver/etc_init.d_openvswitch |   17 +++++++++++------
> 1 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
> index 72d7d57..74ada6f 100755
> --- a/xenserver/etc_init.d_openvswitch
> +++ b/xenserver/etc_init.d_openvswitch
> @@ -76,14 +76,19 @@ case ${NETWORK_MODE:=openvswitch} in
> esac
> 
> # General config variables in /etc/sysconfig/openvswitch
> -if test "$PRODUCT_VERSION" = "5.5.0"; then
> -    # XenServer 5.5.0 needs ovs-brcompatd and /proc/net simulation.
> +if [ -f /etc/xensource-inventory ]; then
> +    if test "$PRODUCT_VERSION" = "5.5.0"; then
> +        # XenServer 5.5.0 needs ovs-brcompatd and /proc/net simulation.
> +        : ${ENABLE_BRCOMPAT:=y}
> +        : ${ENABLE_FAKE_PROC_NET:=y}
> +    else
> +        # Later versions don't need them.
> +        : ${ENABLE_BRCOMPAT:=n}
> +        : ${ENABLE_FAKE_PROC_NET:=n}
> +    fi
> +else
>     : ${ENABLE_BRCOMPAT:=y}
>     : ${ENABLE_FAKE_PROC_NET:=y}
> -else
> -    # Later versions don't need them.
> -    : ${ENABLE_BRCOMPAT:=n}
> -    : ${ENABLE_FAKE_PROC_NET:=n}
> fi
> : ${ENABLE_MONITOR:=y}
> : ${FORCE_COREFILES:=y}
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org