utilities: skip loading kernel module if kernel has no module support

Signed-off-by: Pim van den Berg <pim@nethuis.nl>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 08646d37398f46af6aa2bad92225cf3e5d3cdabc..64ede540153d34cb419e19d2b2c2ee39272af274 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -99,6 +99,7 @@ Paul Fazzone            pfazzone@nicira.com
 Paul Ingram             paul@nicira.com
 Pavithra Ramesh         paramesh@vmware.com
 Philippe Jung           phil.jung@free.fr
+Pim van den Berg        pim@nethuis.nl
 pritesh                 pritesh.kothari@cisco.com
 Pravin B Shelar         pshelar@nicira.com
 Raju Subramanian        rsubramanian@nicira.com

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index f76555325a94456ec593310676713eebce15f2f5..170f39a946e6c7f8cabc01361dba2029978eb599 100755 (executable)
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -31,6 +31,13 @@ done
 ## ----- ##
 
 insert_mod_if_required () {
+    # If this kernel has no module support, expect we're done.
+    if test ! -e /proc/modules
+    then
+        log_success_msg "Kernel has no loadable module support. Skipping modprobe"
+        return 0
+    fi
+
     # If openvswitch is already loaded then we're done.
     test -e /sys/module/openvswitch -o -e /sys/module/openvswitch_mod && \
      return 0