Changeset 26386 in vbox

Timestamp:

Feb 9, 2010 3:29:44 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux: xorg.conf hacking scripts: cosmetics

Location:

trunk/src/VBox/Additions

Files:

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

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

@@ -74 +74 @@
 elif [ -f /etc/redhat-release ]; then
     system=redhat
+elif [ -f /etc/debian_version ]; then
+    system=debian
 elif [ -f /etc/SuSE-release ]; then
     system=suse
@@ -163 +165 @@
 fi
 
-if [ "$system" = "other" ]; then
+if [ "$system" = "debian" -o "$system" = "other" ]; then
     fail_msg() {
         echo " ...fail!"
@@ -288 +290 @@
     # But without the workaround for SUSE 11.1 not doing input auto-detection
     newmouse=""
-    # By default we want to use hal for auto-loading the mouse driver
-    usehal="--useHal"
+    # By default we want to use hal/udev/whatever for auto-loading the mouse driver
+    automouse="--autoMouse"
+        # But we only install the udev rule if we detect a server that needs it
+        udevmouse=""
     # We need to tell our xorg.conf hacking script whether /dev/psaux exists
     nopsaux="--nopsaux"
@@ -325 +329 @@
             vboxmouse_src=vboxmouse_drv_17.so
             setupxorgconf=""
+                        test "$system" = "debian" && udevmouse="true"
             ;;
         1.5.99.* | 1.6.* )
@@ -349 +354 @@
             vboxmouse_src=vboxmouse_drv_15.so
             # SUSE with X.Org 1.5 is a special case, and is handled specially
-            test -r /etc/SuSE-release &&
-            { usehal=""; newmouse="--newMouse"; }
+            test "$system" = "suse" &&
+            { automouse=""; newmouse="--newMouse"; }
             ;;
         1.4.* )
@@ -356 +361 @@
             vboxvideo_src=vboxvideo_drv_14.so
             vboxmouse_src=vboxmouse_drv_14.so
-            usehal=""
+            automouse=""
             newmouse="--newMouse"
             ;;
@@ -365 +370 @@
             vboxvideo_src=vboxvideo_drv_13.so
             vboxmouse_src=vboxmouse_drv_13.so
-            usehal=""
+            automouse=""
             newmouse="--newMouse"
             ;;
@@ -372 +377 @@
             vboxvideo_src=vboxvideo_drv_71.so
             vboxmouse_src=vboxmouse_drv_71.so
-            usehal=""
+            automouse=""
             testrandr=""
             ;;
@@ -379 +384 @@
             vboxvideo_src=vboxvideo_drv_70.so
             vboxmouse_src=vboxmouse_drv_70.so
-            usehal=""
+            automouse=""
             testrandr=""
             ;;
@@ -389 +394 @@
             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"
-            usehal=""
+            automouse=""
             testrandr=""
             succ_msg
@@ -425 +430 @@
         # Those versions can autoload vboxvideo though, so we don't need to
         # hack the configuration file for them.
-        test -f /etc/debian_version -a -d /usr/share/xserver-xorg/pci &&
+        test "$system" = "debian" -a -d /usr/share/xserver-xorg/pci &&
         {
             rm -f "/usr/share/xserver-xorg/pci/vboxvideo.ids"
             ln -s "$share_dir/vboxvideo.ids" /usr/share/xserver-xorg/pci 2>/dev/null
-            test -n "$usehal" && setupxorgconf=""
+            test -n "$automouse" && setupxorgconf=""
         }
 
@@ -441 +446 @@
                         generated="$generated  `printf "$i\n"`"
                     else
-                        "$lib_dir/x11config-new.pl" $newmouse $usehal $nopsaux "$i"
+                        "$lib_dir/x11config-new.pl" $newmouse $automouse $nopsaux "$i"
                     fi
                     configured="true"
@@ -455 +460 @@
             if test -z "$configured" -a ! -r "$nobak"; then
                 touch "$main_cfg"
-                "$lib_dir/x11config-new.pl" --useHal --noBak "$main_cfg"
+                "$lib_dir/x11config-new.pl" --autoMouse --noBak "$main_cfg"
                 touch "$nobak"
             fi
@@ -461 +466 @@
         # X.Org Server versions starting with 1.5 can do mouse auto-detection,
         # to make our lives easier and spare us the nasty hacks.
-        test -n "$usehal" &&
+        test -n "$automouse" &&
             if [ -d /etc/hal/fdi/policy ]
             then

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

@@ -20 +20 @@
 #
 
-my $use_hal = 0;
+my $auto_mouse = 0;
 my $new_mouse = 0;
 my $no_bak = 0;
@@ -27 +27 @@
 foreach $arg (@ARGV)
 {
-    if (lc($arg) eq "--usehal")
-    {
-        $use_hal = 1;
+    if (lc($arg) eq "--autoMouse")
+    {
+        $auto_mouse = 1;
     }
     elsif (lc($arg) eq "--newmouse")
@@ -111 +111 @@
             }
 
-            if (!$use_hal && !$new_mouse) {
+            if (!$auto_mouse && !$new_mouse) {
                 print TMP <<EOF;
 
@@ -137 +137 @@
             }
 
-            if (!$use_hal && $new_mouse) {
+            if (!$auto_mouse && $new_mouse) {
                 print TMP <<EOF;