Don't try to modprobe tun if it's built-in (e.g. Ubuntu.)

2010-08-19 14:42:33 -07:00
parent 05c2d669a9
commit e900a16caf
1 changed files with 2 additions and 1 deletions
@@ -471,7 +471,8 @@ class UserSwitch( Switch ):
    @staticmethod
    def setup():
        "Ensure any dependencies are loaded; if not, try to load them."
-        moduleDeps( add=TUN )
+        if not os.path.exists( '/dev/net/tun' ):
+            moduleDeps( add=TUN )

    def start( self, controllers ):
        """Start OpenFlow reference user datapath.