← Back to branch summary

~ubuntu-branches/ubuntu/raring/jockey/raring

« back to all changes in this revision

Viewing changes to data/handlers/broadcom_wl.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-04-23 06:33:47 UTC
  • Revision ID: package-import@ubuntu.com-20130423063347-btsx12mjx3xw5vl6
Tags: 0.9.7-0ubuntu13
https://launchpad.net/bugs/1171048
broadcom_wl.py: Don't rebind or load the module, nor unload the b43*
modules. Installing the package already does that in postinst, and doing
it again in the handler causes an oops in the driver. (LP: #1171048)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/handlers/broadcom_wl.py
6
6
from glob import glob
7
7
 
8
8
from jockey.oslib import OSLib
9
 
from jockey.handlers import KernelModuleHandler
 
9
from jockey.handlers import KernelModuleHandler, Handler
 
10
from jockey import detection
10
11
 
11
12
# dummy stub for xgettext
12
13
def _(x): return x
47
48
            KernelModuleHandler.module_loaded('bcm43xx'))
48
49
 
49
50
    def enable(self):
50
 
        subprocess.call(['/sbin/rmmod', 'b43'])
51
 
        subprocess.call(['/sbin/rmmod', 'b43legacy'])
52
 
        subprocess.call(['/sbin/rmmod', 'bcm43xx'])
53
 
        subprocess.call(['/sbin/rmmod', 'ssb'])
54
 
        KernelModuleHandler.enable(self)
 
51
        # skip KernelModuleHandler.enable() here, as the package's postinst
 
52
        # already does the blacklisting, module loading, and rebinding
 
53
        Handler.enable(self)
 
54
 
 
55
        # just run the parts of KernelModuleHandler.enable() that we need
 
56
        self._modinfo = detection.get_modinfo(self.module)
 
57
        self.read_loaded_modules()
55
58