Changeset 59234 in vbox

Timestamp:

Dec 31, 2015 10:41:47 AM (9 years ago)

Author:

vboxsync

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

104862

Message:

bugref:8087: Additions/x11: support non-root X server: not really necessary for this task, but do set-up and clean-up of the X11 and graphics parts of the Additions from the main Additions service script. This also allows us to share a system image more easily between virtualised and non-virtulaised systems by preventing graphics set-up if we see that we are not running inside a VirtualBox guest.

File:

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

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

@@ -187 +187 @@
         $MODPROBE vboxguest >/dev/null 2>&1 || {
             setup
-            $MODPROBE vboxguest >/dev/null 2>&1 ||
+            $MODPROBE vboxguest >/dev/null 2>&1 || {
+                /sbin/rcvboxadd-x11 cleanup
                 fail "modprobe vboxguest failed"
+            }
         }
         case "$no_udev" in 1)
@@ -209 +211 @@
     }
 
-    # This is needed as X.Org Server 1.13 does not auto-load the module.
-    running_vboxvideo || $MODPROBE vboxvideo > /dev/null 2>&1
+    /sbin/rcvboxadd-x11 setup
     # Install the guest OpenGL drivers.  For now we don't support
     # multi-architecture installations