diff -u module-init-tools-3.12/debian/changelog module-init-tools-3.12/debian/changelog --- module-init-tools-3.12/debian/changelog +++ module-init-tools-3.12/debian/changelog @@ -1,3 +1,10 @@ +module-init-tools (3.12-1ubuntu6) natty; urgency=low + + * Remove intel-3945-iwlagn-disable11n.conf completely as it has an + erroneous module parameter. (LP: #747025) + + -- Tim Gardner Fri, 01 Apr 2011 07:19:50 -0600 + module-init-tools (3.12-1ubuntu5) natty; urgency=low * Added intel-3945-iwlagn-disable11n.conf diff -u module-init-tools-3.12/debian/module-init-tools.preinst module-init-tools-3.12/debian/module-init-tools.preinst --- module-init-tools-3.12/debian/module-init-tools.preinst +++ module-init-tools-3.12/debian/module-init-tools.preinst @@ -94,6 +94,10 @@ if dpkg --compare-versions "$2" lt "3.7~pre7-1"; then prep_migrate_config_37 fi + # Unequivocally drop this conf file. Its got a bogus module parameter. + if dpkg --compare-versions "$2" le "3.12-1ubuntu6"; then + rm -f /etc/modprobe.d/intel-3945-iwlagn-disable11n.conf + fi ;; abort-upgrade) reverted: --- module-init-tools-3.12/debian/modprobe.d/intel-3945-iwlagn-disable11n.conf +++ module-init-tools-3.12.orig/debian/modprobe.d/intel-3945-iwlagn-disable11n.conf @@ -1 +0,0 @@ -options iwl3945 11n_disable=1