Ubuntu
bcmwl package

Merge lp:~vanvugt/ubuntu/oneiric/bcmwl/fix-776165 into lp:ubuntu/oneiric/bcmwl

  1. Oneiric (11.10)
  2. fix-776165
  3. Merge into oneiric
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 30
Proposed branch: lp:~vanvugt/ubuntu/oneiric/bcmwl/fix-776165
Merge into: lp:ubuntu/oneiric/bcmwl
Diff against target: 30 lines (+4/-6)
1 file modified
debian/bcmwl-kernel-source.postinst (+4/-6)
To merge this branch: bzr merge lp:~vanvugt/ubuntu/oneiric/bcmwl/fix-776165
Reviewer Review Type Date Requested Status
Michael Terry Approve
Ubuntu branches Pending
Review via email: mp+62822@code.launchpad.net

Commit message

Always update /etc/modprobe.d/blacklist-bcm43.conf during upgrades (LP: #776165)

Description of the change

Always update /etc/modprobe.d/blacklist-bcm43.conf during upgrades (LP: #776165)

Don't skip updating /etc/modprobe.d/blacklist-bcm43.conf if it already exists (especially when upgrading the bcmwl-kernel-source package).

That would prevent you from getting the latest fixes to /etc/modprobe.d/blacklist-bcm43.conf like bug 747002.

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

This fix should also be back-ported to natty.

Revision history for this message
Michael Terry (mterry) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/bcmwl-kernel-source.postinst'
2--- debian/bcmwl-kernel-source.postinst 2011-04-18 12:14:43 +0000
3+++ debian/bcmwl-kernel-source.postinst 2011-05-30 06:21:01 +0000
4@@ -35,8 +35,7 @@
5 /usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2
6
7 # Create a blacklist file
8- if [ ! -f $BLACKLIST_FILE ]; then
9- cat > $BLACKLIST_FILE <<EOF
10+ cat > $BLACKLIST_FILE <<EOF
11 # Warning: This file is autogenerated by $PACKAGE_NAME. All changes to this file will be lost.
12 blacklist b43
13 blacklist b43legacy
14@@ -44,13 +43,12 @@
15 blacklist bcm43xx
16 blacklist brcm80211
17 EOF
18- # If b44 is loaded, append these additional lines
19- if lsmod | grep b44 > /dev/null; then
20- cat >> $BLACKLIST_FILE <<EOF
21+ # If b44 is loaded, append these additional lines
22+ if lsmod | grep b44 > /dev/null; then
23+ cat >> $BLACKLIST_FILE <<EOF
24 blacklist b44
25 install wl modprobe -r b43 b44 b43legacy ssb; modprobe --ignore-install wl $CMDLINE_OPTS; modprobe --ignore-install b44
26 EOF
27- fi
28 fi
29
30 # Update initramfs

Subscribers

People subscribed via source and target branches