Thanks Justin and Ethan. Applied to master, with your acks.
On Sun, Apr 05, 2015 at 01:46:55PM -0700, Ethan Jackson wrote: > I think this is fine. Though I agree with Justin the script > documentation should be update. I can take care of that tomorrow. > > Acked-by: Ethan Jackson <[email protected]> > > > On Sun, Apr 5, 2015 at 1:40 PM, Ben Pfaff <[email protected]> wrote: > > This is hardly urgent so I'll leave this one for Ethan to review. > > > > On Sun, Apr 05, 2015 at 12:35:38PM -0700, Justin Pettit wrote: > >> For the actual change: > >> > >> Acked-by: Justin Pettit <[email protected]> > >> > >> In this script, the documentation calls out insmod'ing openvswitch.ko. My > >> guess is that if someone is explicitly insmod'ing the main OVS kernel > >> module, the environment won't be setup to pull in the appropriate vport > >> kernel modules. I wonder if the documentation should be updated. Ethan, > >> I think this is your baby, so what do you think? > >> > >> --Justin > >> > >> > >> > On Apr 5, 2015, at 12:12 PM, Ben Pfaff <[email protected]> wrote: > >> > > >> > My guess is that this is the intent. > >> > > >> > Signed-off-by: Ben Pfaff <[email protected]> > >> > --- > >> > utilities/ovs-dev.py | 5 +++-- > >> > 1 file changed, 3 insertions(+), 2 deletions(-) > >> > > >> > diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py > >> > index 869d89e..9467df5 100755 > >> > --- a/utilities/ovs-dev.py > >> > +++ b/utilities/ovs-dev.py > >> > @@ -1,5 +1,5 @@ > >> > #!/usr/bin/python > >> > -# Copyright (c) 2013, 2014 Nicira, Inc. > >> > +# Copyright (c) 2013, 2014, 2015 Nicira, Inc. > >> > # > >> > # Licensed under the Apache License, Version 2.0 (the "License"); > >> > # you may not use this file except in compliance with the License. > >> > @@ -269,7 +269,8 @@ def modinst(): > >> > pass # Module isn't loaded > >> > > >> > try: > >> > - _sh("rm /lib/modules/%s/extra/openvswitch.ko" % uname()) > >> > + _sh("rm -f /lib/modules/%s/extra/openvswitch.ko" % uname()) > >> > + _sh("rm -f /lib/modules/%s/extra/vport-*.ko" % uname()) > >> > except subprocess.CalledProcessError, e: > >> > pass # Module isn't installed > >> > > >> > -- > >> > 2.1.3 > >> > > >> > _______________________________________________ > >> > dev mailing list > >> > [email protected] > >> > http://openvswitch.org/mailman/listinfo/dev > >> > > _______________________________________________ > > dev mailing list > > [email protected] > > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
