Changeset 25174 in vbox

Timestamp:

Dec 3, 2009 6:09:54 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: more xorg.conf hacking fixes - some old guests do not like /dev/input/mice

Location:

trunk/src/VBox/Additions

Files:

• linux/installer/vboxadd-x11.sh (modified) (5 diffs)
• x11/Installer/x11config-new.pl (modified) (3 diffs)

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

@@ -290 +290 @@
     # By default we want to use hal for auto-loading the mouse driver
     usehal="--useHal"
+    # We need to tell our xorg.conf hacking script whether /dev/psaux exists
+    nopsaux="--nopsaux"
+    test -c /dev/psaux && nopsaux=""
     # And on newer servers, we want to test whether dynamic resizing will work
     testrandr="true"
@@ -373 +376 @@
             # Assume X.Org post-fork or XFree86
             begin "Installing XFree86 4.2/4.3 and X.Org 6.7/6.8 modules"
+            rm "$modules_dir/drivers/vboxvideo_drv.o" 2>/dev/null
+            rm "$modules_dir/input/vboxmouse_drv.o" 2>/dev/null
             ln -s "$lib_dir/vboxvideo_drv.o" "$modules_dir/drivers/vboxvideo_drv.o"
             ln -s "$lib_dir/vboxmouse_drv.o" "$modules_dir/input/vboxmouse_drv.o"
@@ -427 +432 @@
                         generated="$generated  `printf "$i\n"`"
                     else
-                        "$lib_dir/x11config-new.pl" $newmouse $usehal "$i"
+                        "$lib_dir/x11config-new.pl" $newmouse $usehal $nopsaux "$i"
                     fi
                     configured="true"
@@ -535 +540 @@
         for i in $x11conf_files; do
             if test -r "$i.vbox"; then
-                if test "$i" -ot "$i.vbox" -o -n "$legacy"; then
+                if test ! "$i" -nt "$i.vbox" -o -n "$legacy"; then
                     mv -f "$i.vbox" "$i"
                     grep -q -E 'vboxvideo|vboxmouse' "$i" &&
@@ -562 +567 @@
 will continue to work after it is restarted.
 
-$newer
+$failed
 
 EOF

trunk/src/VBox/Additions/x11/Installer/x11config-new.pl

@@ -23 +23 @@
 my $new_mouse = 0;
 my $no_bak = 0;
+my $old_mouse_dev = "/dev/psaux";
 
 foreach $arg (@ARGV)
@@ -37 +38 @@
     {
         $no_bak = 1;
+    }
+    elsif (lc($arg) eq "--nopsaux")
+    {
+        $old_mouse_dev = "/dev/input/mice";
     }
     else
@@ -113 +118 @@
   Driver      "vboxmouse"
   Option      "Buttons" "9"
-  Option      "Device" "/dev/input/mice"
+  Option      "Device" "$old_mouse_dev"
   Option      "Name" "VirtualBox Mouse"
   Option      "Protocol" "explorerps/2"