[ovs-dev] [PATCH] xenserver: Fix ip_gre_mod modprobe issue in init script

[Ian Campbell]

Is this module only required when the base kernel doesn't already
include GRE support of its own? It looks as if XenServer 5.6 has
ip_gre.ko so I guess this is 5.5 specific?

Does any action need to be taken on 5.6 to ensure the module is loaded
when required? I notice the module has a different name under 2.6.27 to
what you appear to be using if that matters.

Ian.

On Mon, 2010-04-12 at 21:15 +0100, Justin Pettit wrote:
> The OVS kernel modules were moved to kernel/extra/openvswitch, but the
> init script wasn't updated to look for the ip_gre_mod kernel module
> there.  This commit fixes that.
> 
> CC: Paul Ingram <paul at nicira.com>
> ---
>  xenserver/etc_init.d_openvswitch |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
> index 8b703fc..b7feb9b 100755
> --- a/xenserver/etc_init.d_openvswitch
> +++ b/xenserver/etc_init.d_openvswitch
> @@ -126,7 +126,7 @@ function insert_modules_if_required {
>      if [ "$ENABLE_BRCOMPAT" = "y" ] && [ -n "$BRCOMPATD_PIDFILE" ] && ! lsmod | grep -q "brcompat_mod"; then
>          action "Inserting brcompat module" modprobe brcompat_mod
>      fi
> -    if [ -f "/lib/modules/`uname -r`/kernel/net/openvswitch/ip_gre_mod.ko" ] && ! lsmod | grep -q "ip_gre_mod"; then
> +    if [ -f "/lib/modules/`uname -r`/kernel/extra/openvswitch/ip_gre_mod.ko" ] && ! lsmod | grep -q "ip_gre_mod"; then
>          action "Inserting ip_gre module" modprobe ip_gre_mod
>      fi
>  }