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

This commit is contained in:
Bob Lantz
2015-03-23 17:15:59 -07:00
parent c2be20f09e
commit 269cecd3ee
+4 -1
View File
@@ -319,6 +319,8 @@ function ovs {
return return
fi fi
if [ "$DIST" = "Ubuntu" ] && ! version_ge $RELEASE 14.04; then
# Older Ubuntu versions need openvswitch-datapath/-dkms
# Manually installing openvswitch-datapath may be necessary # Manually installing openvswitch-datapath may be necessary
# for manually built kernel .debs using Debian's defective kernel # for manually built kernel .debs using Debian's defective kernel
# packaging, which doesn't yield usable headers. # packaging, which doesn't yield usable headers.
@@ -328,6 +330,7 @@ function ovs {
# Otherwise, install it. # Otherwise, install it.
$install openvswitch-datapath-dkms $install openvswitch-datapath-dkms
fi fi
fi
$install openvswitch-switch $install openvswitch-switch
if $install openvswitch-controller; then if $install openvswitch-controller; then
@@ -343,7 +346,7 @@ function ovs {
else else
echo "Attempting to install openvswitch-testcontroller" echo "Attempting to install openvswitch-testcontroller"
if ! $install openvswitch-testcontroller; then if ! $install openvswitch-testcontroller; then
echo "Failed - giving up" echo "Failed - skipping openvswitch-testcontroller"
fi fi
fi fi