Changeset 50925 in vbox for trunk/src/VBox

Timestamp:

Mar 31, 2014 8:14:22 AM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: make sure symlinks to the VBoxGuestAdditions folder and to mount.vboxsf are set correctly.

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/vboxadd.sh (modified) (1 diff)
• Installer/linux/run-inst.sh (modified) (1 diff)

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

@@ -44 +44 @@
   i[3456789]86|x86)
     cpu="x86"
-    lib_path="/usr/lib"
+    lib_candidates="/usr/lib/i386-linux-gnu /usr/lib /lib"
     ;;
   x86_64|amd64)
     cpu="amd64"
-    if test -d "/usr/lib64"; then
-      lib_path="/usr/lib64"
-    else
-      lib_path="/usr/lib"
-    fi
+    lib_candidates="/usr/lib/x86_64-linux-gnu /usr/lib64 /usr/lib /lib64 /lib"
     ;;
 esac
+for i in $lib_candidates; do
+  if test -d "$i/VBoxGuestAdditions"; then
+    lib_path=$i
+    break
+  fi
+done
 
 if [ -f /etc/arch-release ]; then

trunk/src/VBox/Installer/linux/run-inst.sh

@@ -359 +359 @@
 link_into_fs "sbin" "/usr/sbin"
 link_into_fs "lib" "$lib_path"
+add_symlink "$INSTALLATION_DIR/lib/$PACKAGE" /usr/lib/"$PACKAGE"
 link_into_fs "share" "/usr/share"
 link_into_fs "src" "/usr/src"