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

[Daniel van Vugt]

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

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.

[Kees Cook (kees)]

This has been uplaoded to -proposed as part of the fix for bug 747002.

review: Approve

=== modified file 'debian/bcmwl-kernel-source.postinst'
--- debian/bcmwl-kernel-source.postinst	2011-04-18 12:14:43 +0000
+++ debian/bcmwl-kernel-source.postinst	2011-06-02 05:20:59 +0000
@@ -35,8 +35,7 @@
 	/usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2
 	
 	# Create a blacklist file
-	if [ ! -f $BLACKLIST_FILE ]; then
-		cat > $BLACKLIST_FILE <<EOF
+	cat > $BLACKLIST_FILE <<EOF
 # Warning: This file is autogenerated by $PACKAGE_NAME. All changes to this file will be lost.
 blacklist b43
 blacklist b43legacy
@@ -44,13 +43,12 @@
 blacklist bcm43xx
 blacklist brcm80211
 EOF
-		# If b44 is loaded, append these additional lines
-		if lsmod | grep b44 > /dev/null; then
-			cat >> $BLACKLIST_FILE <<EOF
+	# If b44 is loaded, append these additional lines
+	if lsmod | grep b44 > /dev/null; then
+		cat >> $BLACKLIST_FILE <<EOF
 blacklist b44
 install wl modprobe -r b43 b44 b43legacy ssb; modprobe --ignore-install wl $CMDLINE_OPTS; modprobe --ignore-install b44
 EOF
-		fi
 	fi
 	
 	# Update initramfs