Changeset 28998 in vbox for trunk/src/VBox/Additions/linux/installer/vboxadd.sh

Timestamp:

May 4, 2010 9:44:57 AM (15 years ago)

Author:

vboxsync

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

61029

Message:

Linux Additions: rename the vboxvfs module to vboxsf to make it load by demand of the Linux kernel

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (9 diffs)

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

@@ -32 +32 @@
 PACKAGE=VBoxGuestAdditions
 BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
-BUILDVBOXVFS=`/bin/ls /usr/src/vboxvfs*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
+BUILDVBOXSF=`/bin/ls /usr/src/vboxsf*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
 BUILDVBOXVIDEO=`/bin/ls /usr/src/vboxvideo*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
 LOG="/var/log/vboxadd-install.log"
@@ -189 +189 @@
 }
 
-running_vboxvfs()
-{
-    lsmod | grep -q "vboxvfs[^_-]"
+running_vboxsf()
+{
+    lsmod | grep -q "vboxsf[^_-]"
 }
 
@@ -256 +256 @@
     fi
 
-    if [ -n "$BUILDVBOXVFS" ]; then
-        running_vboxvfs || {
-            $MODPROBE vboxvfs > /dev/null 2>&1 || {
+    if [ -n "$BUILDVBOXSF" ]; then
+        running_vboxsf || {
+            $MODPROBE vboxsf > /dev/null 2>&1 || {
                 if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
                     fail_msg
@@ -265 +265 @@
                     exit 1
                 fi
-                fail "modprobe vboxvfs failed"
+                fail "modprobe vboxsf failed"
             }
         }
@@ -284 +284 @@
         fail "Cannot unmount vboxsf folders"
     fi
-    if [ -n "$BUILDVBOXVFS" ]; then
-        if running_vboxvfs; then
-            rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
+    if [ -n "$BUILDVBOXSF" ]; then
+        if running_vboxsf; then
+            rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf"
         fi
     fi
@@ -313 +313 @@
         succ_msg
     fi
-    if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then
-        begin "Removing old VirtualBox vboxvfs kernel module"
-        find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+    if find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|grep -q vboxsf; then
+        begin "Removing old VirtualBox vboxsf kernel module"
+        find /lib/modules/`uname -r` -name "vboxsf\.*" 2>/dev/null|xargs rm -f 2>/dev/null
         succ_msg
     fi
@@ -341 +341 @@
     fi
     succ_msg
-    if [ -n "$BUILDVBOXVFS" ]; then
+    if [ -n "$BUILDVBOXSF" ]; then
         begin "Building the shared folder support module"
-        if ! $BUILDVBOXVFS \
+        if ! $BUILDVBOXSF \
             --use-module-symvers /tmp/vboxguest-Module.symvers \
             --no-print-directory install >> $LOG 2>&1; then
@@ -416 +416 @@
     if [ -n "$DKMS" ]; then
       echo "Attempt to remove old DKMS modules..."
-      for mod in vboxadd vboxguest vboxvfs vboxvideo; do
+      for mod in vboxadd vboxguest vboxvfs vboxsf vboxvideo; do
         $DKMS status -m $mod | while read line; do
           if echo "$line" | grep -q added > /dev/null ||
@@ -434 +434 @@
     find /lib/modules -name vboxguest\* | xargs rm 2>/dev/null
     find /lib/modules -name vboxvfs\* | xargs rm 2>/dev/null
+    find /lib/modules -name vboxsf\* | xargs rm 2>/dev/null
     find /lib/modules -name vboxvideo\* | xargs rm 2>/dev/null
     depmod
 
     # Remove old module sources
-    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxvideo-*
+    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxsf-* /usr/src/vboxvideo-*
 
     # Remove other files