From 2b26161000d3e3ea738a2e316d7d29d0f25c65c3 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 13 Feb 2012 17:13:53 -0800
Subject: [PATCH] More OVS install fixes.

---
 util/install.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/util/install.sh b/util/install.sh
index 35b82e6..a8e0d2a 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -209,14 +209,12 @@ function ovs {
         tar xf $OVS_PACKAGE_NAME
         orig=`tar tf $OVS_PACKAGE_NAME`
         # Now install packages in reasonable dependency order
-        order='common pki openvswitch-switch brcompat controller dkms'
+        order='dkms common pki openvswitch-switch brcompat controller'
         pkgs=""
         for p in $order; do
             pkg=`echo "$orig" | grep $p`
-            pkgs="$pkgs $pkg"
+            $pkginst $pkg
         done
-        echo PKGS $pkgs
-        $pkginst $pkgs
         # Switch can run on its own, but 
         # Mininet should control the controller
 	if [ -e /etc/init.d/openvswitch-controller ]; then
@@ -275,7 +273,7 @@ function 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 $pkgs
     if ! $remove $pkgs; then