Changeset 24531 in vbox for trunk/src/VBox

Timestamp:

Nov 9, 2009 11:17:57 PM (15 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: more fixes

Location:

trunk/src/VBox/Additions/linux/installer

Files:

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

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

@@ -421 +421 @@
         then
             cp /etc/X11/xorg.conf /etc/X11/xorg.conf.bak 2> /dev/null
-            cp "$lib_dir/linux_xorg_suse11.conf" /etc/X11/xorg.conf 2> /dev/null
+            cp "$share_dir/linux_xorg_suse11.conf" /etc/X11/xorg.conf 2> /dev/null
         elif [ $dox11config15 -eq 1 ]
         then

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

@@ -307 +307 @@
     echo
     if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
-        --no-dkms --no-print-directory > $LOG 2>&1; then
+        --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"
         BUILDVBOXVIDEO=""
@@ -314 +314 @@
     if ! $BUILDVBOXGUEST \
         --save-module-symvers /tmp/vboxguest-Module.symvers \
-        --no-print-directory install > $LOG 2>&1; then
+        --no-print-directory install >> $LOG 2>&1; then
         fail "Look at $LOG to find out what went wrong"
     fi
@@ -395 +395 @@
             version=`echo "$line" | sed "s/$mod,\([^,]*\)[,:].*/\1/;t;d"`
             echo "  removing module $mod version $version"
-            $DKMS remove -m $mod -v $version --all
+            $DKMS remove -m $mod -v $version --all 2>/dev/null
           fi
         done
@@ -409 +409 @@
     depmod
 
+    # Remove old module sources
+    rm -rf /usr/src/vboxadd-* /usr/src/vboxguest-* /usr/src/vboxvfs-* /usr/src/vboxvideo-*
+
     # Remove other files
     rm /sbin/mount.vboxsf 2>/dev/null