diff -u module-init-tools-3.11.1/debian/changelog module-init-tools-3.11.1/debian/changelog --- module-init-tools-3.11.1/debian/changelog +++ module-init-tools-3.11.1/debian/changelog @@ -1,3 +1,12 @@ +module-init-tools (3.11.1-2ubuntu2) lucid; urgency=low + + * CONFIG_NF_CT_ACCT will be deprecated, so preserve exisiting + behavior with future LTS backported kernels by setting the + module parameter acct. + -LP: #595971 + + -- Tim Gardner Fri, 18 Jun 2010 13:01:35 -0600 + module-init-tools (3.11.1-2ubuntu1) lucid; urgency=low * Blacklist viafb; the only framebuffer drivers we want loaded by default only in patch2: unchanged: --- module-init-tools-3.11.1.orig/debian/modprobe.d/nf_conntrack.conf +++ module-init-tools-3.11.1/debian/modprobe.d/nf_conntrack.conf @@ -0,0 +1,8 @@ +# +# CONFIG_NF_CT_ACCT will be deprecated, likely by 2.6.36. Set +# the corresponding module parameter in order to preserve existing +# behavior with future LTS backport kernels. +# +# http://bugs.launchpad.net/bugs/595971 +# +options nf_conntrack acct=1