From e5b54a314311c443c3f5323eba192ab7af98ae66 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 13 Feb 2012 11:35:17 -0800
Subject: [PATCH] Only install module manually if we built OVS from source.

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

diff --git a/util/install.sh b/util/install.sh
index 29df896..35b82e6 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -270,6 +270,8 @@ function ovs {
     ../configure $opts
     make
     sudo make install
+
+    modprobe
 }
 
 function remove_ovs {
@@ -416,7 +418,6 @@ function all {
     mn_deps
     of
     ovs
-    modprobe
     nox
     oftest
     cbench
@@ -470,7 +471,7 @@ function usage {
     printf -- ' -f: install open(F)low\n' >&2
     printf -- ' -h: print this (H)elp message\n' >&2
     printf -- ' -k: install new (K)ernel\n' >&2
-    printf -- ' -m: install Open vSwitch kernel (M)odule\n' >&2
+    printf -- ' -m: install Open vSwitch kernel (M)odule from source dir\n' >&2
     printf -- ' -n: install mini(N)et dependencies + core files\n' >&2
     printf -- ' -r: remove existing Open vSwitch packages\n' >&2
     printf -- ' -t: install o(T)her stuff\n' >&2