VirtualBox

Changeset 48924 in vbox for trunk/src/VBox/Installer/darwin


Ignore:
Timestamp:
Oct 7, 2013 1:49:09 PM (11 years ago)
Author:
vboxsync
Message:

Moved the kernel extension from /Library/Extensions to /Library/Application Support/VirtualBox to work around new signing requirements for kexts in that directory in 10.9.

Location:
trunk/src/VBox/Installer/darwin
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool

    r47894 r48924  
    1 #!/bin/sh
    2 #
     1#!/bin/bash
     2# $Id$
     3## @file
    34# VirtualBox Uninstaller Script.
     5#
     6
    47#
    58# Copyright (C) 2007-2013 Oracle Corporation
     
    4649# Note: Do NOT attempt adding directories or filenames with spaces!
    4750#
    48 my_directories=""
    49 my_files=""
     51declare -a my_directories
     52declare -a my_files
    5053
    5154# Users files first
    52 test -f "${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist"  && my_files="$my_files ${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist"
    53 
    54 test -d /Library/StartupItems/VirtualBox/          && my_directories="$my_directories /Library/StartupItems/VirtualBox/"
    55 test -d /Library/Receipts/VBoxStartupItems.pkg/    && my_directories="$my_directories /Library/Receipts/VBoxStartupItems.pkg/"
    56 
    57 test -d /Library/Extensions/VBoxDrv.kext/          && my_directories="$my_directories /Library/Extensions/VBoxDrv.kext/"
    58 test -d /Library/Extensions/VBoxUSB.kext/          && my_directories="$my_directories /Library/Extensions/VBoxUSB.kext/"
    59 test -d /Library/Extensions/VBoxNetFlt.kext/       && my_directories="$my_directories /Library/Extensions/VBoxNetFlt.kext/"
    60 test -d /Library/Extensions/VBoxNetAdp.kext/       && my_directories="$my_directories /Library/Extensions/VBoxNetAdp.kext/"
     55test -f "${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist"  && my_files+=("${HOME}/Library/LaunchAgents/org.virtualbox.vboxwebsrv.plist")
     56
     57test -d /Library/StartupItems/VirtualBox/          && my_directories+=("/Library/StartupItems/VirtualBox/")
     58test -d /Library/Receipts/VBoxStartupItems.pkg/    && my_directories+=("/Library/Receipts/VBoxStartupItems.pkg/")
     59
     60test -d "/Library/Application Support/VirtualBox/VBoxDrv.kext/"     && my_directories+=("/Library/Application Support/VirtualBox/VBoxDrv.kext/")
     61test -d "/Library/Application Support/VirtualBox/VBoxUSB.kext/"     && my_directories+=("/Library/Application Support/VirtualBox/VBoxUSB.kext/")
     62test -d "/Library/Application Support/VirtualBox/VBoxNetFlt.kext/"  && my_directories+=("/Library/Application Support/VirtualBox/VBoxNetFlt.kext/")
     63test -d "/Library/Application Support/VirtualBox/VBoxNetAdp.kext/"  && my_directories+=("/Library/Application Support/VirtualBox/VBoxNetAdp.kext/")
     64# Pre 4.3.0rc1 locations:
     65test -d /Library/Extensions/VBoxDrv.kext/          && my_directories+=("/Library/Extensions/VBoxDrv.kext/")
     66test -d /Library/Extensions/VBoxUSB.kext/          && my_directories+=("/Library/Extensions/VBoxUSB.kext/")
     67test -d /Library/Extensions/VBoxNetFlt.kext/       && my_directories+=("/Library/Extensions/VBoxNetFlt.kext/")
     68test -d /Library/Extensions/VBoxNetAdp.kext/       && my_directories+=("/Library/Extensions/VBoxNetAdp.kext/")
    6169# Tiger support is obsolete, but we leave it here for a clean removing of older
    6270# VirtualBox versions
    63 test -d /Library/Extensions/VBoxDrvTiger.kext/     && my_directories="$my_directories /Library/Extensions/VBoxDrvTiger.kext/"
    64 test -d /Library/Extensions/VBoxUSBTiger.kext/     && my_directories="$my_directories /Library/Extensions/VBoxUSBTiger.kext/"
    65 test -d /Library/Receipts/VBoxKEXTs.pkg/           && my_directories="$my_directories /Library/Receipts/VBoxKEXTs.pkg/"
    66 
    67 test -f /usr/bin/VirtualBox                        && my_files="$my_files /usr/bin/VirtualBox"
    68 test -f /usr/bin/VBoxManage                        && my_files="$my_files /usr/bin/VBoxManage"
    69 test -f /usr/bin/VBoxVRDP                          && my_files="$my_files /usr/bin/VBoxVRDP"
    70 test -f /usr/bin/VBoxHeadless                      && my_files="$my_files /usr/bin/VBoxHeadless"
    71 test -f /usr/bin/vboxwebsrv                        && my_files="$my_files /usr/bin/vboxwebsrv"
    72 test -f /usr/bin/VBoxBalloonCtrl                   && my_files="$my_files /usr/bin/VBoxBalloonCtrl"
    73 test -f /usr/bin/VBoxAutostart                     && my_files="$my_files /usr/bin/VBoxAutostart"
    74 test -f /usr/bin/vbox-img                          && my_files="$my_files /usr/bin/vbox-img"
    75 test -d /Library/Receipts/VirtualBoxCLI.pkg/       && my_directories="$my_directories /Library/Receipts/VirtualBoxCLI.pkg/"
    76 
    77 test -d /Applications/VirtualBox.app/              && my_directories="$my_directories /Applications/VirtualBox.app/"
    78 test -d /Library/Receipts/VirtualBox.pkg/          && my_directories="$my_directories /Library/Receipts/VirtualBox.pkg/"
     71test -d /Library/Extensions/VBoxDrvTiger.kext/     && my_directories+=("/Library/Extensions/VBoxDrvTiger.kext/")
     72test -d /Library/Extensions/VBoxUSBTiger.kext/     && my_directories+=("/Library/Extensions/VBoxUSBTiger.kext/")
     73test -d /Library/Receipts/VBoxKEXTs.pkg/           && my_directories+=("/Library/Receipts/VBoxKEXTs.pkg/")
     74
     75test -f /usr/bin/VirtualBox                        && my_files+=("/usr/bin/VirtualBox")
     76test -f /usr/bin/VBoxManage                        && my_files+=("/usr/bin/VBoxManage")
     77test -f /usr/bin/VBoxVRDP                          && my_files+=("/usr/bin/VBoxVRDP")
     78test -f /usr/bin/VBoxHeadless                      && my_files+=("/usr/bin/VBoxHeadless")
     79test -f /usr/bin/vboxwebsrv                        && my_files+=("/usr/bin/vboxwebsrv")
     80test -f /usr/bin/VBoxBalloonCtrl                   && my_files+=("/usr/bin/VBoxBalloonCtrl")
     81test -f /usr/bin/VBoxAutostart                     && my_files+=("/usr/bin/VBoxAutostart")
     82test -f /usr/bin/vbox-img                          && my_files+=("/usr/bin/vbox-img")
     83test -d /Library/Receipts/VirtualBoxCLI.pkg/       && my_directories+=("/Library/Receipts/VirtualBoxCLI.pkg/")
     84
     85test -d /Applications/VirtualBox.app/              && my_directories+=("/Applications/VirtualBox.app/")
     86test -d /Library/Receipts/VirtualBox.pkg/          && my_directories+=("/Library/Receipts/VirtualBox.pkg/")
    7987
    8088# legacy
    81 test -d /Library/Receipts/VBoxDrv.pkg/             && my_directories="$my_directories /Library/Receipts/VBoxDrv.pkg/"
    82 test -d /Library/Receipts/VBoxUSB.pkg/             && my_directories="$my_directories /Library/Receipts/VBoxUSB.pkg/"
     89test -d /Library/Receipts/VBoxDrv.pkg/             && my_directories+=("/Library/Receipts/VBoxDrv.pkg/")
     90test -d /Library/Receipts/VBoxUSB.pkg/             && my_directories+=("/Library/Receipts/VBoxUSB.pkg/")
    8391
    8492# python stuff
    8593python_versions="2.3 2.5 2.6 2.7"
    8694for p in $python_versions; do
    87     test -f /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.py  && my_files="$my_files /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.py"
    88     test -f /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.pyc && my_files="$my_files /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.pyc"
    89     test -f /Library/Python/$p/site-packages/vboxapi/__init__.py              && my_files="$my_files /Library/Python/$p/site-packages/vboxapi/__init__.py"
    90     test -f /Library/Python/$p/site-packages/vboxapi/__init__.pyc             && my_files="$my_files /Library/Python/$p/site-packages/vboxapi/__init__.pyc"
    91     test -f /Library/Python/$p/site-packages/vboxapi-1.0-py$p.egg-info        && my_files="$my_files /Library/Python/$p/site-packages/vboxapi-1.0-py$p.egg-info"
    92     test -d /Library/Python/$p/site-packages/vboxapi/                         && my_directories="$my_directories /Library/Python/$p/site-packages/vboxapi/"
     95    test -f /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.py  && my_files+=("/Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.py")
     96    test -f /Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.pyc && my_files+=("/Library/Python/$p/site-packages/vboxapi/VirtualBox_constants.pyc")
     97    test -f /Library/Python/$p/site-packages/vboxapi/__init__.py              && my_files+=("/Library/Python/$p/site-packages/vboxapi/__init__.py")
     98    test -f /Library/Python/$p/site-packages/vboxapi/__init__.pyc             && my_files+=("/Library/Python/$p/site-packages/vboxapi/__init__.pyc")
     99    test -f /Library/Python/$p/site-packages/vboxapi-1.0-py$p.egg-info        && my_files+=("/Library/Python/$p/site-packages/vboxapi-1.0-py$p.egg-info")
     100    test -d /Library/Python/$p/site-packages/vboxapi/                         && my_directories+=("/Library/Python/$p/site-packages/vboxapi/")
    93101done
    94102
     
    97105# Note that the unload order is significant.
    98106#
    99 my_kexts=""
     107declare -a my_kexts
    100108for kext in org.virtualbox.kext.VBoxUSB org.virtualbox.kext.VBoxNetFlt org.virtualbox.kext.VBoxNetAdp org.virtualbox.kext.VBoxDrv; do
    101109    if /usr/sbin/kextstat -b $kext -l | grep -q $kext; then
    102         my_kexts="$my_kexts $kext"
     110        my_kexts+=("$kext")
    103111    fi
    104112done
     
    113121# Did we find anything to uninstall?
    114122#
    115 if test -z "$my_directories"  -a  -z "$my_files"   -a  -z "$my_kexts"  -a  -z "$my_pkgs"; then
     123if test -z "${my_directories[*]}"  -a  -z "${my_files[*]}"   -a  -z "${my_kexts[*]}"  -a  -z "$my_pkgs"; then
    116124    echo "No VirtualBox files, directories, KEXTs or packages to uninstall."
    117125    echo "Done."
     
    151159# and get the user's consent before continuing.
    152160#
    153 if test -n "$my_files"  -o  -n "$my_directories"; then
     161if test -n "${my_files[*]}"  -o  -n "${my_directories[*]}"; then
    154162    echo "The following files and directories (bundles) will be removed:"
    155     for file in $my_files;       do echo "    $file"; done
    156     for dir  in $my_directories; do echo "    $dir"; done
    157 fi
    158 if test -n "$my_kexts"; then
     163    for file in "${my_files[@]}";       do echo "    $file"; done
     164    for dir  in "${my_directories[@]}"; do echo "    $dir"; done
     165    echo ""
     166fi
     167if test -n "${my_kexts[*]}"; then
    159168    echo "And the following KEXTs will be unloaded:"
    160     for kext in $my_kexts;       do echo "    $kext"; done
     169    for kext in "${my_kexts[@]}";       do echo "    $kext"; done
     170    echo ""
    161171fi
    162172if test -n "$my_pkgs"; then
    163173    echo "And the traces of following packages will be removed:"
    164174    for kext in $my_pkgs;       do echo "    $kext"; done
    165 fi
    166 echo ""
     175    echo ""
     176fi
    167177
    168178if test "$my_default_prompt" != "Yes"; then
     
    193203echo ""
    194204
    195 if test -n "$my_files"  -o  -n "$my_directories"; then
    196     /usr/bin/sudo -p "Please enter %u's password:" /bin/rm -Rf $my_files $my_directories
     205if test -n "${my_files[*]}"  -o  -n "${my_directories[*]}"; then
     206    /usr/bin/sudo -p "Please enter %u's password:" /bin/rm -Rf "${my_files[@]}" "${my_directories[@]}"
    197207    my_rc=$?
    198208    if test "$my_rc" -ne 0; then
     
    207217
    208218my_rc=0
    209 for kext in $my_kexts; do
     219for kext in "${my_kexts[@]}"; do
    210220    echo unloading $kext
    211221    /usr/bin/sudo -p "Please enter %u's password (unloading $kext):" /sbin/kextunload -m $kext
  • trunk/src/VBox/Installer/darwin/Makefile.kmk

    r48912 r48924  
    270270                $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res \
    271271                $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/English.lproj
    272         $(MKDIR) -p -m 1775 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library
    273272        $(MKDIR) -p -m 0755 \
    274                 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions \
     273                $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root \
    275274                $(foreach kext,$(VBOX_DI_KEXTS), \
    276                         $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext \
    277                         $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents \
    278                         $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS )
     275                        $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext \
     276                        $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents \
     277                        $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS )
    279278        @# Copy the common files (Info.plist).
    280279        $(foreach kext,$(VBOX_DI_KEXTS), \
    281                 $(NLTAB)$(INSTALL) -m 0644 $(VBOX_PATH_DIST)/$(kext).kext/Contents/Info.plist $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/)
     280                $(NLTAB)$(INSTALL) -m 0644 $(VBOX_PATH_DIST)/$(kext).kext/Contents/Info.plist $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/)
    282281        @# Copy the binaries and invoking lipo.
    283282ifdef VBOX_WITH_COMBINED_PACKAGE
     
    286285                        $(VBOX_PATH_DIST_32)/$(kext).kext/Contents/MacOS/$(kext) \
    287286                        $(VBOX_PATH_DIST_64)/$(kext).kext/Contents/MacOS/$(kext) \
    288                         -output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS/$(kext))
     287                        -output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/$(kext))
    289288else
    290289        $(foreach kext,$(VBOX_DI_KEXTS), \
    291                 $(NLTAB)$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/$(kext).kext/Contents/MacOS/$(kext) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS/)
     290                $(NLTAB)$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/$(kext).kext/Contents/MacOS/$(kext) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/)
    292291endif
    293292        @# Signed the kext bundles.
    294293ifdef VBOX_SIGNING_MODE
    295294        $(foreach kext,$(VBOX_DI_KEXTS) \
    296                 ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext/Contents/MacOS/$(kext),org.virtualbox.app.kext.macos.$(kext)) )
     295                ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/$(kext),org.virtualbox.app.kext.$(kext)) )
    297296        $(foreach kext,$(VBOX_DI_KEXTS), \
    298                 $(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/$(kext).kext,) )
     297                $(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext,org.virtualbox.app.kext.$(kext)) )
     298        $(foreach kext,$(VBOX_DI_KEXTS), $(NLTAB)codesign --verify --verbose 1 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext )
    299299endif
    300300        @# Set the correct owners.
    301         sudo chown    root:admin $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library
    302         sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions
     301        sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/
    303302        @# Do keyword replacement in the package info and description files.
    304303        $(SED) \
     
    316315        @# Build the package.
    317316        $(VBOX_PKGBUILD) \
    318                 --root   $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/ \
     317                --root   $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/ \
    319318                --component-plist $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc/PkgBuildComponent.plist \
    320319                --script $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res \
    321320                --identifier org.virtualbox.pkg.vboxkexts \
    322321                --version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
    323                 --install-location /Library/Extensions/ \
     322                --install-location "/Library/Application Support/VirtualBox" \
    324323                --ownership preserve \
    325324                $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
  • trunk/src/VBox/Installer/darwin/VBoxKEXTs/postflight

    r48919 r48924  
    11#!/bin/sh
     2# $Id$
     3## @file
     4# Reloads the new kernel extension at the end of installation.
     5#
    26
    37#
    4 # Copyright (C) 2007-2010 Oracle Corporation
     8# Copyright (C) 2007-2013 Oracle Corporation
    59#
    610# This file is part of VirtualBox Open Source Edition (OSE), as
     
    3539sync
    3640set -e
    37 kextload    /Library/Extensions/VBoxDrv.kext
    38 kextload -d /Library/Extensions/VBoxDrv.kext      /Library/Extensions/VBoxUSB.kext
    39 kextload -d /Library/Extensions/VBoxDrv.kext      /Library/Extensions/VBoxNetFlt.kext
    40 kextload -d /Library/Extensions/VBoxDrv.kext      /Library/Extensions/VBoxNetAdp.kext
     41kextload    '/Library/Application Support/VirtualBox/VBoxDrv.kext'
     42kextload -d '/Library/Application Support/VirtualBox/VBoxDrv.kext'  '/Library/Application Support/VirtualBox/VBoxUSB.kext'
     43kextload -d '/Library/Application Support/VirtualBox/VBoxDrv.kext'  '/Library/Application Support/VirtualBox/VBoxNetFlt.kext'
     44kextload -d '/Library/Application Support/VirtualBox/VBoxDrv.kext'  '/Library/Application Support/VirtualBox/VBoxNetAdp.kext'
    4145
  • trunk/src/VBox/Installer/darwin/VBoxStartupItems/VirtualBox/Resources/English.lproj/Localizable.strings

    r33550 r48924  
    33<plist version="0.9">
    44<dict>
    5         <key>VirtualBox Support Driver</key>                                    <string>VirtualBox Support Driver</string>
    6         <key>Loading VBoxDrv.kext</key>                                         <string>Loading VBoxDrv.kext</string>
    7         <key>Loading VBoxUSB.kext</key>                                         <string>Loading VBoxUSB.kext</string>
    8         <key>Loading VBoxNetFlt.kext</key>                                      <string>Loading VBoxNetFlt.kext</string>
    9         <key>Loading VBoxNetAdp.kext</key>                                      <string>Loading VBoxNetAdp.kext</string>
    10         <key>Unloading VBoxDrv.kext</key>                                       <string>Unloading VBoxDrv.kext</string>
    11         <key>Unloading VBoxUSB.kext</key>                                       <string>Unloading VBoxUSB.kext</string>
    12         <key>Unloading VBoxNetFlt.kext</key>                                    <string>Unloading VBoxNetFlt.kext</string>
    13         <key>Unloading VBoxNetAdp.kext</key>                                    <string>Unloading VBoxNetAdp.kext</string>
    14         <key>Error: /Library/Extensions/VBoxDrv.kext is missing</key>           <string>Error: /Library/Extensions/VBoxDrv.kext is missing</string>
    15         <key>Error: /Library/Extensions/VBoxUSB.kext is missing</key>           <string>Error: /Library/Extensions/VBoxUSB.kext is missing</string>
    16         <key>Error: /Library/Extensions/VBoxNetFlt.kext is missing</key>        <string>Error: /Library/Extensions/VBoxNetFlt.kext is missing</string>
    17         <key>Error: /Library/Extensions/VBoxNetAdp.kext is missing</key>        <string>Error: /Library/Extensions/VBoxNetAdp.kext is missing</string>
    18         <key>Error: VBoxDrv.kext is already loaded</key>                        <string>Error: VBoxDrv.kext is already loaded</string>
    19         <key>Error: VBoxUSB.kext is already loaded</key>                        <string>Error: VBoxUSB.kext is already loaded</string>
    20         <key>Error: VBoxNetFlt.kext is already loaded</key>                     <string>Error: VBoxNetFlt.kext is already loaded</string>
    21         <key>Error: VBoxNetAdp.kext is already loaded</key>                     <string>Error: VBoxNetAdp.kext is already loaded</string>
    22         <key>Error: Failed to load /Library/Extensions/VBoxDrv.kext</key>       <string>Error: Failed to load /Library/Extensions/VBoxDrv.kext</string>
    23         <key>Error: Failed to load /Library/Extensions/VBoxUSB.kext</key>       <string>Error: Failed to load /Library/Extensions/VBoxUSB.kext</string>
    24         <key>Error: Failed to load /Library/Extensions/VBoxNetFlt.kext</key>    <string>Error: Failed to load /Library/Extensions/VBoxNetFlt.kext</string>
    25         <key>Error: Failed to load /Library/Extensions/VBoxNetAdp.kext</key>    <string>Error: Failed to load /Library/Extensions/VBoxNetAdp.kext</string>
    26         <key>Error: Failed to unload VBoxDrv.kext</key>                         <string>Error: Failed to unload VBoxDrv.kext</string>
    27         <key>Error: Failed to unload VBoxUSB.kext</key>                         <string>Error: Failed to unload VBoxUSB.kext</string>
    28         <key>Error: Failed to unload VBoxNetFlt.kext</key>                      <string>Error: Failed to unload VBoxNetFlt.kext</string>
    29         <key>Error: Failed to unload VBoxNetAdp.kext</key>                      <string>Error: Failed to unload VBoxNetAdp.kext</string>
     5        <key>VirtualBox Support Driver</key>                                                     <string>VirtualBox Support Driver</string>
     6        <key>Loading VBoxDrv.kext</key>                                                          <string>Loading VBoxDrv.kext</string>
     7        <key>Loading VBoxUSB.kext</key>                                                          <string>Loading VBoxUSB.kext</string>
     8        <key>Loading VBoxNetFlt.kext</key>                                                       <string>Loading VBoxNetFlt.kext</string>
     9        <key>Loading VBoxNetAdp.kext</key>                                                       <string>Loading VBoxNetAdp.kext</string>
     10        <key>Unloading VBoxDrv.kext</key>                                                        <string>Unloading VBoxDrv.kext</string>
     11        <key>Unloading VBoxUSB.kext</key>                                                        <string>Unloading VBoxUSB.kext</string>
     12        <key>Unloading VBoxNetFlt.kext</key>                                                     <string>Unloading VBoxNetFlt.kext</string>
     13        <key>Unloading VBoxNetAdp.kext</key>                                                     <string>Unloading VBoxNetAdp.kext</string>
     14        <key>Error: /Library/Application Support/VirtualBox/VBoxDrv.kext is missing</key>        <string>Error: /Library/Application Support/VirtualBox/VBoxDrv.kext is missing</string>
     15        <key>Error: /Library/Application Support/VirtualBox/VBoxUSB.kext is missing</key>        <string>Error: /Library/Application Support/VirtualBox/VBoxUSB.kext is missing</string>
     16        <key>Error: /Library/Application Support/VirtualBox/VBoxNetFlt.kext is missing</key>     <string>Error: /Library/Application Support/VirtualBox/VBoxNetFlt.kext is missing</string>
     17        <key>Error: /Library/Application Support/VirtualBox/VBoxNetAdp.kext is missing</key>     <string>Error: /Library/Application Support/VirtualBox/VBoxNetAdp.kext is missing</string>
     18        <key>Error: VBoxDrv.kext is already loaded</key>                                         <string>Error: VBoxDrv.kext is already loaded</string>
     19        <key>Error: VBoxUSB.kext is already loaded</key>                                         <string>Error: VBoxUSB.kext is already loaded</string>
     20        <key>Error: VBoxNetFlt.kext is already loaded</key>                                      <string>Error: VBoxNetFlt.kext is already loaded</string>
     21        <key>Error: VBoxNetAdp.kext is already loaded</key>                                      <string>Error: VBoxNetAdp.kext is already loaded</string>
     22        <key>Error: Failed to load /Library/Application Support/VirtualBox/VBoxDrv.kext</key>    <string>Error: Failed to load /Library/Application Support/VirtualBox/VBoxDrv.kext</string>
     23        <key>Error: Failed to load /Library/Application Support/VirtualBox/VBoxUSB.kext</key>    <string>Error: Failed to load /Library/Application Support/VirtualBox/VBoxUSB.kext</string>
     24        <key>Error: Failed to load /Library/Application Support/VirtualBox/VBoxNetFlt.kext</key> <string>Error: Failed to load /Library/Application Support/VirtualBox/VBoxNetFlt.kext</string>
     25        <key>Error: Failed to load /Library/Application Support/VirtualBox/VBoxNetAdp.kext</key> <string>Error: Failed to load /Library/Application Support/VirtualBox/VBoxNetAdp.kext</string>
     26        <key>Error: Failed to unload VBoxDrv.kext</key>                                          <string>Error: Failed to unload VBoxDrv.kext</string>
     27        <key>Error: Failed to unload VBoxUSB.kext</key>                                          <string>Error: Failed to unload VBoxUSB.kext</string>
     28        <key>Error: Failed to unload VBoxNetFlt.kext</key>                                       <string>Error: Failed to unload VBoxNetFlt.kext</string>
     29        <key>Error: Failed to unload VBoxNetAdp.kext</key>                                       <string>Error: Failed to unload VBoxNetAdp.kext</string>
    3030</dict>
    3131</plist>
  • trunk/src/VBox/Installer/darwin/VBoxStartupItems/VirtualBox/VirtualBox

    r31673 r48924  
    11#!/bin/sh
     2# $Id$
     3## @file
     4# Startup service for loading the kernel extensions and select the set of VBox
     5# binaries that matches the kernel architecture.
     6#
    27
    38#
    4 # Copyright (C) 2007-2010 Oracle Corporation
     9# Copyright (C) 2007-2013 Oracle Corporation
    510#
    611# This file is part of VirtualBox Open Source Edition (OSE), as
     
    4954    # Check that all the directories exist first.
    5055    #
    51     if [ ! -d /Library/Extensions/${VBOXDRV}.kext ]; then
    52         ConsoleMessage "Error: /Library/Extensions/${VBOXDRV}.kext is missing"
     56    if [ ! -d "/Library/Application Support/VirtualBox/${VBOXDRV}.kext" ]; then
     57        ConsoleMessage "Error: /Library/Application Support/VirtualBox/${VBOXDRV}.kext is missing"
    5358        VBOX_RC=1
    5459    fi
    55     if [ ! -d /Library/Extensions/${VBOXUSB}.kext ]; then
    56         ConsoleMessage "Error: /Library/Extensions/${VBOXUSB}.kext is missing"
     60    if [ ! -d "/Library/Application Support/VirtualBox/${VBOXUSB}.kext" ]; then
     61        ConsoleMessage "Error: /Library/Application Support/VirtualBox/${VBOXUSB}.kext is missing"
    5762        VBOX_RC=1
    5863    fi
    59     if [ ! -d /Library/Extensions/VBoxNetFlt.kext ]; then
    60         ConsoleMessage "Error: /Library/Extensions/VBoxNetFlt.kext is missing"
     64    if [ ! -d "/Library/Application Support/VirtualBox/VBoxNetFlt.kext" ]; then
     65        ConsoleMessage "Error: /Library/Application Support/VirtualBox/VBoxNetFlt.kext is missing"
    6166        VBOX_RC=1
    6267    fi
    63     if [ ! -d /Library/Extensions/VBoxNetAdp.kext ]; then
    64         ConsoleMessage "Error: /Library/Extensions/VBoxNetAdp.kext is missing"
     68    if [ ! -d "/Library/Application Support/VirtualBox/VBoxNetAdp.kext" ]; then
     69        ConsoleMessage "Error: /Library/Application Support/VirtualBox/VBoxNetAdp.kext is missing"
    6570        VBOX_RC=1
    6671    fi
     
    7277    if [ $VBOX_RC -eq 0 ]; then
    7378        if kextstat -lb org.virtualbox.kext.VBoxDrv 2>&1 | grep -q org.virtualbox.kext.VBoxDrv; then
    74             ConsoleMessage -v "Error: ${VBOXDRV}.kext is already loaded"
     79            ConsoleMessage "Error: ${VBOXDRV}.kext is already loaded"
    7580            VBOX_RC=1
    7681        fi
    7782        if kextstat -lb org.virtualbox.kext.VBoxUSB 2>&1 | grep -q org.virtualbox.kext.VBoxUSB; then
    78             ConsoleMessage -v "Error: ${VBOXUSB}.kext is already loaded"
     83            ConsoleMessage "Error: ${VBOXUSB}.kext is already loaded"
    7984            VBOX_RC=1
    8085        fi
    8186        if kextstat -lb org.virtualbox.kext.VBoxNetFlt 2>&1 | grep -q org.virtualbox.kext.VBoxNetFlt; then
    82             ConsoleMessage -v "Error: VBoxNetFlt.kext is already loaded"
     87            ConsoleMessage "Error: VBoxNetFlt.kext is already loaded"
    8388            VBOX_RC=1
    8489        fi
    8590        if kextstat -lb org.virtualbox.kext.VBoxNetAdp 2>&1 | grep -q org.virtualbox.kext.VBoxNetAdp; then
    86             ConsoleMessage -v "Error: VBoxNetAdp.kext is already loaded"
     91            ConsoleMessage "Error: VBoxNetAdp.kext is already loaded"
    8792            VBOX_RC=1
    8893        fi
     
    9499    if [ $VBOX_RC -eq 0 ]; then
    95100        ConsoleMessage "Loading ${VBOXDRV}.kext"
    96         if ! kextload /Library/Extensions/${VBOXDRV}.kext; then
    97             ConsoleMessage "Error: Failed to load /Library/Extensions/${VBOXDRV}.kext"
     101        if ! kextload "/Library/Application Support/VirtualBox/${VBOXDRV}.kext"; then
     102            ConsoleMessage "Error: Failed to load /Library/Application Support/VirtualBox/${VBOXDRV}.kext"
    98103            VBOX_RC=1
    99104        fi
    100105
    101106        ConsoleMessage "Loading ${VBOXUSB}.kext"
    102         if ! kextload -d /Library/Extensions/${VBOXDRV}.kext /Library/Extensions/${VBOXUSB}.kext; then
    103             ConsoleMessage "Error: Failed to load /Library/Extensions/${VBOXUSB}.kext"
     107        if ! kextload -d "/Library/Application Support/VirtualBox/${VBOXDRV}.kext" "/Library/Application Support/VirtualBox/${VBOXUSB}.kext"; then
     108            ConsoleMessage "Error: Failed to load /Library/Application Support/VirtualBox/${VBOXUSB}.kext"
    104109            VBOX_RC=1
    105110        fi
    106111
    107112        ConsoleMessage "Loading VBoxNetFlt.kext"
    108         if ! kextload -d /Library/Extensions/${VBOXDRV}.kext /Library/Extensions/VBoxNetFlt.kext; then
    109             ConsoleMessage "Error: Failed to load /Library/Extensions/VBoxNetFlt.kext"
     113        if ! kextload -d "/Library/Application Support/VirtualBox/${VBOXDRV}.kext" "/Library/Application Support/VirtualBox/VBoxNetFlt.kext"; then
     114            ConsoleMessage "Error: Failed to load /Library/Application Support/VirtualBox/VBoxNetFlt.kext"
    110115            VBOX_RC=1
    111116        fi
    112117
    113118        ConsoleMessage "Loading VBoxNetAdp.kext"
    114         if ! kextload -d /Library/Extensions/${VBOXDRV}.kext /Library/Extensions/VBoxNetAdp.kext; then
    115             ConsoleMessage "Error: Failed to load /Library/Extensions/VBoxNetAdp.kext"
     119        if ! kextload -d "/Library/Application Support/VirtualBox/${VBOXDRV}.kext" "/Library/Application Support/VirtualBox/VBoxNetAdp.kext"; then
     120            ConsoleMessage "Error: Failed to load /Library/Application Support/VirtualBox/VBoxNetAdp.kext"
    116121            VBOX_RC=1
    117122        fi
     
    145150        ConsoleMessage "Unloading ${VBOXUSB}.kext"
    146151        if ! kextunload -m org.virtualbox.kext.VBoxUSB; then
    147             ConsoleMessage -v "Error: Failed to unload VBoxUSB.kext"
     152            ConsoleMessage "Error: Failed to unload VBoxUSB.kext"
    148153            VBOX_RC=1
    149154        fi
     
    153158        ConsoleMessage "Unloading VBoxNetFlt.kext"
    154159        if ! kextunload -m org.virtualbox.kext.VBoxNetFlt; then
    155             ConsoleMessage -v "Error: Failed to unload VBoxNetFlt.kext"
     160            ConsoleMessage "Error: Failed to unload VBoxNetFlt.kext"
    156161            VBOX_RC=1
    157162        fi
     
    161166        ConsoleMessage "Unloading VBoxNetAdp.kext"
    162167        if ! kextunload -m org.virtualbox.kext.VBoxNetAdp; then
    163             ConsoleMessage -v "Error: Failed to unload VBoxNetAdp.kext"
     168            ConsoleMessage "Error: Failed to unload VBoxNetAdp.kext"
    164169            VBOX_RC=1
    165170        fi
     
    170175        ConsoleMessage "Unloading ${VBOXDRV}.kext"
    171176        if ! kextunload -m org.virtualbox.kext.VBoxDrv; then
    172             ConsoleMessage -v "Error: Failed to unload VBoxDrv.kext"
     177            ConsoleMessage "Error: Failed to unload VBoxDrv.kext"
    173178            VBOX_RC=1
    174179        fi
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette