From 19c12401d654308b9ee0333c83a2df8e28161385 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 5 Apr 2015 12:12:14 -0700 Subject: 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 Acked-by: Justin Pettit Acked-by: Ethan Jackson --- 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 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 -- cgit v1.2.1