| Message ID | 1452017921-28212-1-git-send-email-guru@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Jan 05, 2016 at 10:18:41AM -0800, Gurucharan Shetty wrote: > The latest Open vSwitch kernel module from Upstream linux does not > list "version". During debian package installation, we would see > a non-harmful error in the log. This patch suppresses it. > > Signed-off-by: Gurucharan Shetty <guru@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
On Tue, Jan 05, 2016 at 10:18:41AM -0800, Gurucharan Shetty wrote: > The latest Open vSwitch kernel module from Upstream linux does not > list "version". During debian package installation, we would see > a non-harmful error in the log. This patch suppresses it. > > Signed-off-by: Gurucharan Shetty <guru@ovn.org> > --- > debian/openvswitch-switch.init | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init > index aece780..ddf2192 100755 > --- a/debian/openvswitch-switch.init > +++ b/debian/openvswitch-switch.init > @@ -1,3 +1,4 @@ > +w > #! /bin/sh > # > # Copyright (C) 2011, 2012 Nicira, Inc. Actually the "w" up there looks like a typo, please remove.
On 5 January 2016 at 11:28, Ben Pfaff <blp@ovn.org> wrote: > On Tue, Jan 05, 2016 at 10:18:41AM -0800, Gurucharan Shetty wrote: > > The latest Open vSwitch kernel module from Upstream linux does not > > list "version". During debian package installation, we would see > > a non-harmful error in the log. This patch suppresses it. > > > > Signed-off-by: Gurucharan Shetty <guru@ovn.org> > > --- > > debian/openvswitch-switch.init | 13 +++++++++---- > > 1 file changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/debian/openvswitch-switch.init > b/debian/openvswitch-switch.init > > index aece780..ddf2192 100755 > > --- a/debian/openvswitch-switch.init > > +++ b/debian/openvswitch-switch.init > > @@ -1,3 +1,4 @@ > > +w > > #! /bin/sh > > # > > # Copyright (C) 2011, 2012 Nicira, Inc. > > Actually the "w" up there looks like a typo, please remove. > Ugh. Thanks for noticing, it crept in after testing.
diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index aece780..ddf2192 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -1,3 +1,4 @@ +w #! /bin/sh # # Copyright (C) 2011, 2012 Nicira, Inc. @@ -87,11 +88,15 @@ restart () { depmod -a if [ -e /sys/module/openvswitch ]; then - LOADED_SRCVERSION=`cat /sys/module/openvswitch/srcversion` - LOADED_VERSION=`cat /sys/module/openvswitch/version` + LOADED_SRCVERSION=`cat /sys/module/openvswitch/srcversion \ + 2>/dev/null` + LOADED_VERSION=`cat /sys/module/openvswitch/version \ + 2>/dev/null` elif [ -e /sys/module/openvswitch_mod ]; then - LOADED_SRCVERSION=`cat /sys/module/openvswitch_mod/srcversion` - LOADED_VERSION=`cat /sys/module/openvswitch_mod/version` + LOADED_SRCVERSION=`cat /sys/module/openvswitch_mod/srcversion \ + 2>/dev/null` + LOADED_VERSION=`cat /sys/module/openvswitch_mod/version \ + 2>/dev/null` fi SRCVERSION=`modinfo -F srcversion openvswitch 2>/dev/null` VERSION=`modinfo -F version openvswitch 2>/dev/null`
The latest Open vSwitch kernel module from Upstream linux does not list "version". During debian package installation, we would see a non-harmful error in the log. This patch suppresses it. Signed-off-by: Gurucharan Shetty <guru@ovn.org> --- debian/openvswitch-switch.init | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)