Changeset 15909 in vbox for trunk/src/VBox/HostDrivers/linux

Timestamp:

Jan 13, 2009 11:01:30 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

41531

Message:

Target "load":

Avoid misleading ERROR messages from rmmod by only removing a
module when it is actually in the kernel. Be verbose about that.

File:

• trunk/src/VBox/HostDrivers/linux/Makefile (modified) (2 diffs)

trunk/src/VBox/HostDrivers/linux/Makefile

@@ -5 +5 @@
 #
 #
-# Copyright (C) 2008 Sun Microsystems, Inc.
+# Copyright (C) 2008-2009 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -51 +51 @@
 
 load:
-        @/sbin/rmmod vboxnetflt || true
-        @/sbin/rmmod vboxdrv || true
-        @/sbin/insmod vboxdrv.ko
-        @if [ -f vboxnetflt.ko ]; then /sbin/insmod vboxnetflt.ko; fi
+        @for module in vboxnetflt vboxdrv; do \
+                if grep "^$$module " /proc/modules >/dev/null; then \
+                        echo "Removing previously installed $$module module"; \
+                        /sbin/rmmod $$module; \
+                fi; \
+        done
+        @for module in vboxdrv vboxnetflt; do \
+                if test -f $$module.ko; then \
+                        echo "Installing $$module module"; \
+                        /sbin/insmod $$module.ko; \
+                fi; \
+        done