Changeset 46563 in vbox for trunk/src/VBox/Additions/linux/installer

Timestamp:

Jun 14, 2013 3:14:43 PM (12 years ago)

Author:

vboxsync

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

86427

Message:

Additions/linux: cleaned up xorg.conf set-up and fixed a case when no original file was present.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh (modified) (4 diffs)

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

@@ -285 +285 @@
     # By default, we want to run our xorg.conf setup script
     setupxorgconf="true"
-    # On all but the oldest X servers we want to use our new mouse
-    # driver.
-    newmouse="--newMouse"
+    # All but the oldest supported X servers can automatically set up the
+    # keyboard driver.
+    autokeyboard="--autoKeyboard"
     # On more recent servers our kernel mouse driver will be used
     # automatically
@@ -410 +410 @@
             vboxmouse_src=vboxmouse_drv.o
             automouse=""
+            autokeyboard=""  # Actually not true for 6.8, but it doesn't matter.
             ;;
         * )
@@ -459 +460 @@
                         generated="$generated  `printf "$i\n"`"
                     else
-                        "$lib_dir/x11config.sh" $newmouse $automouse $nopsaux "$i"
+                        "$lib_dir/x11config.sh" $autokeyboard $automouse $nopsaux "$i"
                     fi
                     configured="true"
@@ -473 +474 @@
             if test -z "$configured"; then
                 touch "$main_cfg"
-                "$lib_dir/x11config.sh" $newmouse $automouse $nopsaux --noBak "$main_cfg"
+                "$lib_dir/x11config.sh" $autokeyboard $automouse $nopsaux --noBak "$main_cfg"
                 touch "$nobak"
             fi