Changeset 66387 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Mar 31, 2017 6:33:26 PM (8 years ago)

Author:

vboxsync

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

114336

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions: add an uninstaller script in a well-known location (namely, /usr/sbin/vbox-uninstall-guest-additions) that distribution Additions packages can use to uninstall our Additions before putting themselves in place. Vice-versa, distribution-installed Additions should create an executable at the same path to let us uninstall them if the user wants to install our package.

File:

• trunk/src/VBox/Additions/linux/installer/install.sh.in (modified) (4 diffs)

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -17 +17 @@
 #
 
-# This is a stub installation script to be included in VirtualBox Makeself
-# installers which removes any previous installations of the package, unpacks
-# the package into the filesystem (by default under /opt) and starts the real
-# installation script.
-#
 PATH=$PATH:/bin:/sbin:/usr/sbin
 
@@ -28 +23 @@
 PACKAGE_NAME="VirtualBox Guest Additions"
 UNINSTALL="uninstall.sh"
+PUBLIC_UNINSTALL_HOOK="/usr/sbin/vbox-uninstall-guest-additions"
 ROUTINES="routines.sh"
 INSTALLATION_VER="_VERSION_"
@@ -300 +296 @@
 
 # uninstall any previous installation
+# If the currently installed Additions have provided an uninstallation hook, try
+# that first.
+if test -x "${PUBLIC_UNINSTALL_HOOK}"; then
+  "${PUBLIC_UNINSTALL_HOOK}" 1>&2 || 
+    abort "Failed to remove existing installation.  Aborting..."
+fi
+
 INSTALL_DIR=""
 uninstalled=0
@@ -529 +532 @@
   echo "$INSTALLATION_DIR/" >> "$CONFIG_DIR/$CONFIG_FILES"
 
+cat > "${PUBLIC_UNINSTALL_HOOK}" << EOF
+#!/bin/sh
+# This executable provides a well-known way to uninstall VirtualBox Guest
+# Additions in order to re-install them from a different source.  A common case
+# is uninstalling distribution-provide Additions to install the version provided
+# by VirtualBox.  Distributions should put the right command in here to do the
+# removal, e.g. "dnf remove VirtualBox-guest-additions".  Leaving kernel modules
+# provided by the distribution kernel package in place is acceptable if the
+# location does not clash with the VirtualBox-provided module location (misc).
+$INSTALLATION_DIR/$UNINSTALL
+EOF
+chmod 0755 "${PUBLIC_UNINSTALL_HOOK}"
+echo "$PUBLIC_UNINSTALL_HOOK" >> "$CONFIG_DIR/$CONFIG_FILES"
+
 # Test for a problem with old Mesa versions which stopped our 3D libraries
 # from working.  Known to affect Debian 7.11, probably OL/RHEL 5.