Changeset 25687 in vbox

Timestamp:

Jan 8, 2010 9:51:15 AM (15 years ago)

Author:

vboxsync

Message:

Linux host/guest kernel modules: respect unsupported modules on some SUSE distributions

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/vboxadd.sh (modified) (3 diffs)
• Installer/linux/vboxdrv.sh.in (modified) (3 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -39 +39 @@
 BUILDVBOXVIDEO=`/bin/ls /usr/src/vboxvideo*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
 LOG="/var/log/vboxadd-install.log"
+MODPROBE=/sbin/modprobe
+
+if $MODPROBE -c | grep -q '^allow_unsupported_modules  *0'; then
+  MODPROBE="$MODPROBE --allow-unsupported-modules"
+fi
 
 # Check architecture
@@ -205 +210 @@
         }
 
-        modprobe vboxguest >/dev/null 2>&1 || {
+        $MODPROBE vboxguest >/dev/null 2>&1 || {
             fail "modprobe vboxguest failed"
         }
@@ -257 +262 @@
     if [ -n "$BUILDVBOXVFS" ]; then
         running_vboxvfs || {
-            modprobe vboxvfs > /dev/null 2>&1 || {
+            $MODPROBE vboxvfs > /dev/null 2>&1 || {
                 if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
                     fail_msg

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -37 +37 @@
 NOLSB=%NOLSB%
 DEBIAN=%DEBIAN%
+MODPROBE=/sbin/modprobe
+
+if $MODPROBE -c | grep -q '^allow_unsupported_modules  *0'; then
+  MODPROBE="$MODPROBE --allow-unsupported-modules"
+fi
 
 [ -f /lib/lsb/init-functions ] || NOLSB=yes
@@ -167 +172 @@
           echo 2 > /proc/sys/kernel/perf_counter_paranoid 
         fi
-        if ! modprobe vboxdrv > /dev/null 2>&1; then
+        if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
             failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
         fi
@@ -199 +204 @@
         failure "Cannot change owner $GROUPNAME for device $DEVICE"
     fi
-    if ! modprobe vboxnetflt > /dev/null 2>&1; then
+    if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
         failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
     fi
-    if ! modprobe vboxnetadp > /dev/null 2>&1; then
+    if ! $MODPROBE vboxnetadp > /dev/null 2>&1; then
         failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why"
     fi