← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Additions/solaris/Installer/vboxguest.sh

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/solaris/Installer/vboxguest.sh
52
52
module_loaded()
53
53
{
54
54
    if test -f "/etc/name_to_major"; then
55
 
        loadentry=`cat /etc/name_to_major | grep $1`
 
55
        loadentry=`cat /etc/name_to_major | grep "$1 "`
56
56
    else
57
 
        loadentry=`/usr/sbin/modinfo | grep $1`
 
57
        loadentry=`/usr/sbin/modinfo | grep "$1 "`
58
58
    fi
59
59
    if test -z "$loadentry"; then
60
60
        return 1
92
92
        info "VirtualBox guest kernel module already loaded."
93
93
    else
94
94
        /usr/sbin/add_drv -i'pci80ee,cafe' -m'* 0666 root sys' $MODNAME
 
95
        sync
95
96
        if test ! vboxguest_loaded; then
96
97
            abort "Failed to load VirtualBox guest kernel module."
97
98
        elif test -c "/devices/pci@0,0/pci80ee,cafe@4:$MODNAME"; then
98
99
            info "VirtualBox guest kernel module loaded."
99
100
        else
100
 
            stop
101
101
            abort "Aborting due to attach failure."
102
102
        fi
103
103
    fi