openvswitch-datapath-dkms is no longer needed for 14.04+

util/install.sh

@@ -319,14 +319,17 @@ function ovs {
         return
     fi
 
-    # Manually installing openvswitch-datapath may be necessary
+    if [ "$DIST" = "Ubuntu" ] && ! version_ge $RELEASE 14.04; then
-    # for manually built kernel .debs using Debian's defective kernel
+        # Older Ubuntu versions need openvswitch-datapath/-dkms
-    # packaging, which doesn't yield usable headers.
+        # Manually installing openvswitch-datapath may be necessary
-    if ! dpkg --get-selections | grep openvswitch-datapath; then
+        # for manually built kernel .debs using Debian's defective kernel
-        # If you've already installed a datapath, assume you
+        # packaging, which doesn't yield usable headers.
-        # know what you're doing and don't need dkms datapath.
+        if ! dpkg --get-selections | grep openvswitch-datapath; then
-        # Otherwise, install it.
+            # If you've already installed a datapath, assume you
-        $install openvswitch-datapath-dkms
+            # know what you're doing and don't need dkms datapath.
+            # Otherwise, install it.
+            $install openvswitch-datapath-dkms
+        fi
     fi
 
     $install openvswitch-switch
@@ -343,7 +346,7 @@ function ovs {
     else
         echo "Attempting to install openvswitch-testcontroller"
         if ! $install openvswitch-testcontroller; then
-            echo "Failed - giving up"
+            echo "Failed - skipping openvswitch-testcontroller"
         fi
     fi