diff options
Diffstat (limited to 'src/VBox/Installer/linux/VBox.sh')
| -rwxr-xr-x | src/VBox/Installer/linux/VBox.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh index 2243798f..6201a66e 100755 --- a/src/VBox/Installer/linux/VBox.sh +++ b/src/VBox/Installer/linux/VBox.sh @@ -2,7 +2,7 @@ # # Oracle VM VirtualBox startup script, Linux hosts. # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -16,12 +16,16 @@ PATH="/usr/bin:/bin:/usr/sbin:/sbin" CONFIG="/etc/vbox/vbox.cfg" -if [ ! -r "$CONFIG" ]; then - echo "Could not find VirtualBox installation. Please reinstall." - exit 1 -fi - -. "$CONFIG" +test -r "${CONFIG}" && + . "${CONFIG}" +test -z "${INSTALL_DIR}" && + if test -f /usr/lib/virtualbox/VirtualBox && + test -x /usr/lib/virtualbox/VirtualBox; then + INSTALL_DIR=/usr/lib/virtualbox + else + echo "Could not find VirtualBox installation. Please reinstall." + exit 1 + fi # Note: This script must not fail if the module was not successfully installed # because the user might not want to run a VM but only change VM params! @@ -100,9 +104,6 @@ case "$APP" in vboxwebsrv) exec "$INSTALL_DIR/vboxwebsrv" "$@" ;; - VBoxBFE|vboxbfe) - exec "$INSTALL_DIR/VBoxBFE" "$@" - ;; *) echo "Unknown application - $APP" exit 1 |