Merge remote-tracking branch 'ms/iptables-conntrack' into next

This commit is contained in:
Michael Tremer
2016-01-22 00:54:14 +00:00
15 changed files with 122 additions and 21 deletions

View File

@@ -0,0 +1,2 @@
# Disable automatic conntrack helper assignment
options nf_conntrack nf_conntrack_helper=0

View File

@@ -22,6 +22,7 @@ etc/mime.types
etc/modprobe.d
etc/modprobe.d/btmrvl_sdio.conf
etc/modprobe.d/cfg80211.conf
etc/modprobe.d/nf_conntrack.conf
etc/modprobe.d/pcspeaker.conf
etc/modules.conf
etc/mtab