summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2015-04-05 12:12:14 -0700
committerBen Pfaff <blp@nicira.com>2015-04-05 15:02:48 -0700
commit19c12401d654308b9ee0333c83a2df8e28161385 (patch)
tree6df164a86602ec9f3cd2ebcb53b7c947d342b6f5
parent31efbdb998b0267e245b8edc32b34c0dcc45e723 (diff)
downloadopenvswitch-19c12401d654308b9ee0333c83a2df8e28161385.tar.gz
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>
-rwxr-xr-xutilities/ovs-dev.py5
1 files changed, 3 insertions, 2 deletions
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