More OVS install fixes.
This commit is contained in:
+3
-5
@@ -209,14 +209,12 @@ function ovs {
|
|||||||
tar xf $OVS_PACKAGE_NAME
|
tar xf $OVS_PACKAGE_NAME
|
||||||
orig=`tar tf $OVS_PACKAGE_NAME`
|
orig=`tar tf $OVS_PACKAGE_NAME`
|
||||||
# Now install packages in reasonable dependency order
|
# Now install packages in reasonable dependency order
|
||||||
order='common pki openvswitch-switch brcompat controller dkms'
|
order='dkms common pki openvswitch-switch brcompat controller'
|
||||||
pkgs=""
|
pkgs=""
|
||||||
for p in $order; do
|
for p in $order; do
|
||||||
pkg=`echo "$orig" | grep $p`
|
pkg=`echo "$orig" | grep $p`
|
||||||
pkgs="$pkgs $pkg"
|
$pkginst $pkg
|
||||||
done
|
done
|
||||||
echo PKGS $pkgs
|
|
||||||
$pkginst $pkgs
|
|
||||||
# Switch can run on its own, but
|
# Switch can run on its own, but
|
||||||
# Mininet should control the controller
|
# Mininet should control the controller
|
||||||
if [ -e /etc/init.d/openvswitch-controller ]; then
|
if [ -e /etc/init.d/openvswitch-controller ]; then
|
||||||
@@ -275,7 +273,7 @@ function ovs {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function remove_ovs {
|
function remove_ovs {
|
||||||
pkgs=`dpkg-query -l | grep openvswitch | awk '{ print $2;}'`
|
pkgs=`dpkg --get-selections | grep openvswitch | awk '{ print $1;}'`
|
||||||
echo "Removing existing Open vSwitch packages:"
|
echo "Removing existing Open vSwitch packages:"
|
||||||
echo $pkgs
|
echo $pkgs
|
||||||
if ! $remove $pkgs; then
|
if ! $remove $pkgs; then
|
||||||
|
|||||||
Reference in New Issue
Block a user