Changeset 24967 in vbox for trunk/src

Timestamp:

Nov 25, 2009 4:51:23 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: message fixes

Location:

trunk/src/VBox/Additions/linux/installer

Files:

• vboxadd-x11.sh (modified) (9 diffs)
• vboxadd.sh (modified) (1 diff)

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

@@ -307 +307 @@
             ;;
         1.6.99.* | 1.7.* )
-            begin "Installing experimental Xorg Server 1.7 modules"
+            begin "Installing experimental X.Org Server 1.7 modules"
             vboxvideo_src=vboxvideo_drv_17.so
             vboxmouse_src=vboxmouse_drv_17.so
@@ -313 +313 @@
             ;;
         1.5.99.* | 1.6.* )
-            begin "Installing Xorg Server 1.6 modules"
+            begin "Installing X.Org Server 1.6 modules"
             vboxvideo_src=vboxvideo_drv_16.so
             vboxmouse_src=vboxmouse_drv_16.so
@@ -322 +322 @@
             # Fedora 9 shipped X.Org Server version 1.4.99.9x (1.5.0 RC)
             # in its released version
-            begin "Installing Xorg Server 1.5 modules"
+            begin "Installing X.Org Server 1.5 modules"
             vboxvideo_src=vboxvideo_drv_15.so
             vboxmouse_src=vboxmouse_drv_15.so
@@ -330 +330 @@
             ;;
         1.4.* )
-            begin "Installing Xorg Server 1.4 modules"
+            begin "Installing X.Org Server 1.4 modules"
             vboxvideo_src=vboxvideo_drv_14.so
             vboxmouse_src=vboxmouse_drv_14.so
@@ -338 +338 @@
             # This was the first release which gave the server version number
             # rather than the X11 release version when you did 'X -version'.
-            begin "Installing Xorg Server 1.3 modules"
+            begin "Installing X.Org Server 1.3 modules"
             vboxvideo_src=vboxvideo_drv_13.so
             vboxmouse_src=vboxmouse_drv_71.so
@@ -344 +344 @@
             ;;
         7.1.* | 7.2.* )
-            begin "Installing Xorg 7.1 modules"
+            begin "Installing X.Org 7.1 modules"
             vboxvideo_src=vboxvideo_drv_71.so
             vboxmouse_src=vboxmouse_drv_71.so
@@ -351 +351 @@
             ;;
         6.9.* | 7.0.* )
-            begin "Installing Xorg 6.9/7.0 modules"
+            begin "Installing X.Org 6.9/7.0 modules"
             vboxvideo_src=vboxvideo_drv_70.so
             vboxmouse_src=vboxmouse_drv_70.so
@@ -359 +359 @@
         6.7* | 6.8.* | 4.2.* | 4.3.* )
             # Assume X.Org post-fork or XFree86
-            begin "Installing XFree86 4.3/Xorg 6.8 modules"
+            begin "Installing XFree86 4.2/4.3 and X.Org 6.7/6.8 modules"
             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"
@@ -459 +459 @@
     fi
 
-    begin "Installing OpenGL and desktop services components"
+    begin "Installing graphics libraries and desktop services components"
     # Install selinux policy for Fedora 7 and 8 to allow the X server to
     # open device files

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

@@ -313 +313 @@
     if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
         --no-dkms --no-print-directory >> $LOG 2>&1; then
-        printf "Your system does not seem to support OpenGL in the kernel (this requires\nLinux 2.6.27 or later).  The OpenGL support will not be built.\n\n"
+        printf "Your guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem).  This Guest Additions feature will be disabled.\n\n"
         BUILDVBOXVIDEO=""
     fi