Changeset 59197 in vbox

Timestamp:

Dec 21, 2015 1:55:25 PM (9 years ago)

Author:

vboxsync

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

104820

Message:

bugref:8087: Additions/x11: support non-root X server: remove init script code to install the now removed DRI driver.

Location:

trunk/src/VBox/Additions/linux/installer

Files:

• vboxadd-x11.sh (modified) (1 diff)
• vboxadd.sh (modified) (1 diff)

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

@@ -474 +474 @@
     chcon -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
     semanage fcontext -a -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
-    # Install the guest OpenGL drivers.  For now we don't support
-    # multi-architecture installations
-    for dir in /usr/lib/dri /usr/lib32/dri /usr/lib64/dri \
-        /usr/lib/xorg/modules/dri /usr/lib32/xorg/modules/dri \
-        /usr/lib64/xorg/modules/dri /usr/lib/i386-linux-gnu/dri \
-        /usr/lib/x86_64-linux-gnu/dri; do
-        if [ -d $dir ]; then
-            rm -f "$dir/vboxvideo_dri.so"
-            ln -s "$LIB/VBoxOGL.so" "$dir/vboxvideo_dri.so"
-        fi
-    done
 
     # And set up VBoxClient to start when the X session does

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

@@ -211 +211 @@
     # This is needed as X.Org Server 1.13 does not auto-load the module.
     running_vboxvideo || $MODPROBE vboxvideo > /dev/null 2>&1
+    # Install the guest OpenGL drivers.  For now we don't support
+    # multi-architecture installations
     rm -rf /etc/ld.so.conf.d/00vboxvideo.conf
     ldconfig