Changeset 7930 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 11, 2008 4:42:59 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29559

Message:

Additions/x11: Added x11restore and Solaris installer now uninstalls additions fine.

Location:

trunk/src/VBox/Additions

Files:

• solaris/Installer/preremove.sh (modified) (1 diff)
• solaris/Makefile.kmk (modified) (2 diffs)
• x11/installer/98vboxadd-xclient (modified) (1 diff)
• x11/installer/x11config.pl (modified) (1 diff)

trunk/src/VBox/Additions/solaris/Installer/preremove.sh

@@ -24 +24 @@
 /opt/VirtualBoxAdditions/vboxguest.sh stop
 
+# Try and restore xorg.conf!
+echo "Restoring Xorg..."
+/opt/VirtualBoxAdditions/x11restore.pl
+
 echo "Done."
 

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

@@ -53 +53 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
+                $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh \
@@ -85 +86 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(SOLARISINSTDIR)/1099.vboxclient
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl                         $(SOLARISINSTDIR)/x11config.pl
+        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11restore.pl                        $(SOLARISINSTDIR)/x11restore.pl
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf                    $(SOLARISINSTDIR)/solaris_xorg.conf
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh                         $(SOLARISINSTDIR)/VBoxRandR.sh
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf  $(SOLARISINSTDIR)/vboxguest.conf
         $(QUIET)$(CP) -f $(PATH_BIN)/additions/vboxguest                                                    $(SOLARISINSTDIR)/vboxguest
-        $(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARISINSTDIR)/vboxguest,)
+        @#$(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARISINSTDIR)/vboxguest,)
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxClient                                                $(SOLARISINSTDIR)/VBoxClient
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxService                                               $(SOLARISINSTDIR)/VBoxService

trunk/src/VBox/Additions/x11/installer/98vboxadd-xclient

@@ -1 +1 @@
 #!/bin/sh
 # innotek VirtualBox
-# Start the Guest Additions X11 clipboard client
+# Start the Guest Additions X11 Client
 #
 #
-# Copyright 2007-2008 innotek GmbH
+# Copyright (C) 2007-2008 innotek GmbH
 #
-# Use only with permission
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 #
 
 /usr/bin/VBoxClient
+

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

@@ -3 +3 @@
 # innotek VirtualBox
 #
-# Linux Additions X11 config update script
+# Guest Additions X11 config update script
 #
-# Copyright (C) 2006-2007 innotek GmbH
+# Copyright (C) 2006-2008 innotek GmbH
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as