← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to debian/virtualbox-ose-guest-utils.init

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - 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
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/virtualbox-ose-guest-utils.init
2
2
# (C) 2007 Michael Meskes <meskes@debian.org>
3
3
 
4
4
### BEGIN INIT INFO
5
 
# Provides:          vboxadd virtualbox-ose-guest-utils
 
5
# Provides:          vboxguest virtualbox-ose-guest-utils
6
6
# Short-Description: VirtualBox Linux Additions
7
7
# Required-Start:    $remote_fs
8
8
# Required-Stop:     $remote_fs
37
37
        log_begin_msg "Starting VirtualBox Additions"
38
38
 
39
39
        # should already be loaded automatically
40
 
        if ! running vboxadd; then
41
 
                if ! modprobe vboxadd > /dev/null 2>&1; then
42
 
                        # vboxadd not installed, or has a problem
43
 
                        log_failure_msg "Guest additions not available, kernel module not loadable (vboxadd)"
 
40
        if ! running vboxguest; then
 
41
                if ! modprobe vboxguest > /dev/null 2>&1; then
 
42
                        # vboxguest not installed, or has a problem
 
43
                        log_failure_msg "Guest additions not available, kernel module not loadable (vboxguest)"
44
44
                        log_end_msg 1
45
45
                        exit 1
46
46
                fi
88
88
                fi
89
89
        fi
90
90
 
91
 
        if running vboxadd; then
92
 
                if ! rmmod vboxadd 2>/dev/null; then
93
 
                        log_failure_msg "Cannot unload guest additions kernel module (vboxadd)"
 
91
        if running vboxguest; then
 
92
                if ! rmmod vboxguest 2>/dev/null; then
 
93
                        log_failure_msg "Cannot unload guest additions kernel module (vboxguest)"
94
94
                        log_end_msg 1
95
95
                        exit 1
96
96
                fi
106
106
  status)
107
107
        status=0
108
108
 
109
 
        if ! running vboxadd; then
110
 
                echo "Guest additions kernel module (vboxadd) not loaded"
 
109
        if ! running vboxguest; then
 
110
                echo "Guest additions kernel module (vboxguest) not loaded"
111
111
                status=3
112
112
        fi
113
113