From: Ben Pfaff <blp@nicira.com>
Date: Sun, 5 Apr 2015 19:12:14 +0000 (-0700)
Subject: ovs-dev.py: Remove vport-*.ko at same time as openvswitch.ko.
X-Git-Tag: v2.4.0~380
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=19c12401d654308b9ee0333c83a2df8e28161385;p=cascardo%2Fovs.git

ovs-dev.py: Remove vport-*.ko at same time as openvswitch.ko.

My guess is that this is the intent.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
index 869d89e81..9467df521 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