Changeset 12283 in vbox

Timestamp:

Sep 9, 2008 10:19:10 AM (16 years ago)

Author:

vboxsync

Message:

Additions/linux: changed the installer to support Fedora 9

Location:

trunk/src/VBox/Additions

Files:

• linux/Makefile.kmk (modified) (3 diffs)
• linux/installer/90-vboxguest.fdi (added)
• x11/installer/x11config15.pl (copied) (copied from trunk/src/VBox/Additions/x11/installer/x11config.pl ) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -77 +77 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
+                $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl \
                 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test \
                 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c \
@@ -83 +84 @@
                 $(PATH_BIN)/additions/vboxmouse_drv_71.so \
                 $(PATH_BIN)/additions/vboxmouse_drv_14.so \
+                $(PATH_BIN)/additions/vboxmouse_drv_15.so \
                 $(PATH_BIN)/additions/vboxvideo_drv.o \
                 $(PATH_BIN)/additions/vboxvideo_drv_70.so \
@@ -123 +125 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids         $(PATH_TARGET)/install
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl          $(PATH_TARGET)/install
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl        $(PATH_TARGET)/install
+        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi    $(PATH_TARGET)/install
         $(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o        $(PATH_TARGET)/install/vboxmouse_drv.o
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so    $(PATH_TARGET)/install/vboxmouse_drv_70.so
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so    $(PATH_TARGET)/install/vboxmouse_drv_71.so
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so    $(PATH_TARGET)/install/vboxmouse_drv_14.so
+        $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so    $(PATH_TARGET)/install/vboxmouse_drv_15.so
         $(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o        $(PATH_TARGET)/install/vboxvideo_drv.o
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so    $(PATH_TARGET)/install/vboxvideo_drv_70.so

trunk/src/VBox/Additions/x11/installer/x11config15.pl

@@ -3 +3 @@
 # Sun xVM VirtualBox
 #
-# Guest Additions X11 config update script
+# Guest Additions X11 config update script for X.org 1.5
 #
 # Copyright (C) 2006-2008 Sun Microsystems, Inc.
@@ -20 +20 @@
 #
 
+# What this script does: X.org 1.5 introduces full hardware autodetection
+# and no longer requires the user to provide an X.org configuration file.
+# However, if such a file is provided, it will override autodetection of
+# the graphics card (not of vboxmouse as far as I can see).  Although this
+# would normally be the user's business, at least Fedora 9 still generates
+# a configuration file by default, so we have to rewrite it if we want
+# the additions to work on a default guest installation.  So we simply go
+# through any configuration files we may find on the system and replace
+# references to VESA or framebuffer drivers (which might be autodetected
+# for use on a VirtualBox guest) and replace them with vboxvideo.
+
+use File::Copy;
+
 my $temp="/tmp/xorg.conf";
-my $os_type=`uname -s`;
+# The list of possible names of X.org configuration files
 my @cfg_files = ("/etc/X11/xorg.conf-4", "/etc/X11/xorg.conf", "/etc/X11/.xorg.conf", "/etc/xorg.conf",
                  "/usr/etc/X11/xorg.conf-4", "/usr/etc/X11/xorg.conf", "/usr/lib/X11/xorg.conf-4",
-                 "/usr/lib/X11/xorg.conf", "/etc/X11/XF86Config-4", "/etc/X11/XF86Config",
-                 "/etc/XF86Config", "/usr/X11R6/etc/X11/XF86Config-4", "/usr/X11R6/etc/X11/XF86Config",
-                 "/usr/X11R6/lib/X11/XF86Config-4", "/usr/X11R6/lib/X11/XF86Config");
+                 "/usr/lib/X11/xorg.conf");
 my $CFG;
 my $TMP;
 
-my $config_count = 0;
+# Subroutine to roll back after a partial installation
+sub do_fail {
+    foreach $cfg (@cfg_files) {
+        move $cfg.".vbox", $cfg;
+        unlink $cfg.".vbox";
+    }
+    die $1;
+}
 
-foreach $cfg (@cfg_files)
-{
+# Perform the substitution on any configuration file we may find.
+foreach $cfg (@cfg_files) {
 
-    if (open(CFG, $cfg))
-    {
-        open(TMP, ">$temp") or die "Can't create $TMP: $!\n";
+    if (open(CFG, $cfg)) {
+        open(TMP, ">$temp")
+            or &do_fail("Can't create $TMP: $!\n");
 
-        my $have_mouse = 0;
-        my $in_section = 0;
-
-        while (defined ($line = <CFG>))
-        {
-            if ($line =~ /^\s*Section\s*"([a-zA-Z]+)"/i)
-            {
+        while (defined ($line = <CFG>)) {
+            if ($line =~ /^\s*Section\s*"([a-zA-Z]+)"/i) {
                 my $section = lc($1);
-                if (($section eq "inputdevice") || ($section eq "device"))
-                {
+                if ($section eq "device") {
                     $in_section = 1;
                 }
-                if ($section eq "serverlayout")
-                {
-                    $in_layout = 1;
-                }
             } else {
-                if ($line =~ /^\s*EndSection/i)
-                {
+                if ($line =~ /^\s*EndSection/i) {
                     $in_section = 0;
-                    $in_layout = 0;
                 }
             }
 
-            if ($in_section)
-            {
-                if ($line =~ /^\s*driver\s+\"(?:mouse|vboxmouse)\"/i)
-                {
-                    $line = "    Driver      \"vboxmouse\"\n    Option      \"CorePointer\"\n";
-                    $have_mouse = 1
-                }
-
-                # Other drivers sending events interfere badly with pointer integration
-                if ($line =~ /^\s*option\s+\"(?:alwayscore|sendcoreevents|corepointer)\"/i)
-                {
-                    $line = "";
-                }
-
-                # Solaris specific: /dev/kdmouse for PS/2 and not /dev/mouse
-                if ($os_type =~ 'SunOS')
-                {
-                    if ($line =~ /^\s*option\s+\"(?:device)\"\s+\"(?:\/dev\/mouse)\"/i)
-                    {
-                        $line = "    Option      \"Device\" \"\/dev\/kdmouse\"\n"
-                    }
-                }
-
-                if ($line =~ /^\s*driver\s+\"(?:fbdev|vga|vesa|vboxvideo|ChangeMe)\"/i)
-                {
-                    $line = "    Driver      \"vboxvideo\"\n";
-                }
-            }
-            if ($in_layout)
-            {
-                # Other drivers sending events interfere badly with pointer integration
-                if (   $line =~ /^\s*inputdevice.*\"(?:alwayscore|sendcoreevents)\"/i)
-                {
-                    $line = "";
+            if ($in_section) {
+                if ($line =~ /^\s*driver\s+\"(fbdev|vga|vesa|vboxvideo|ChangeMe)\"/i) {
+                    $line =~ s/(fbdev|vga|vesa|vboxvideo|ChangeMe)/vboxvideo/i;
                 }
             }
             print TMP $line;
         }
-
-        if (!$have_mouse) {
-            print TMP "\n";
-            print TMP "Section \"InputDevice\"\n";
-            print TMP "        Identifier  \"VBoxMouse\"\n";
-            print TMP "        Driver      \"vboxmouse\"\n";
-            if ($os_type eq 'SunOS')
-            {
-                print TMP "        Option      \"Device\"     \"\/dev\/kdmouse\"\n";
-            }
-            print TMP "        Option      \"CorePointer\"\n";
-            print TMP "EndSection\n";
-        }
         close(TMP);
 
-        rename $cfg, $cfg.".bak";
-        system("cp $temp $cfg");
+        # We do not overwrite existing $cfg.".vbox" files because that will
+        # likely ruin any future attempts to uninstall the additions
+        copy $cfg, $cfg.".bak";
+        if (! -e $cfg.".vbox") {
+            rename $cfg, $cfg.".vbox";
+        }
+        copy $temp, $cfg
+            or &do_fail("Could not overwrite configuration file $cfg!  Exiting...");
         unlink $temp;
-
-        # Solaris specific: Rename our modified .xorg.conf to xorg.conf for it to be used
-        if (($os_type =~ 'SunOS') && ($cfg =~ '/etc/X11/.xorg.conf'))
-        {
-            system("mv -f $cfg /etc/X11/xorg.conf");
-        }
-
-        $config_count++;
     }
 }
-
-$config_count != 0 or die "Could not find any X11 configuration files";