summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2015-06-23 22:44:45 +0100
committerAlex Harpin <development@landsofshadow.co.uk>2015-06-23 22:44:45 +0100
commiteeb4865ba10e367f8c6025ef165a4cdc4ba531e6 (patch)
tree9fa84069d88a52e7322cc14570aa8322fabe17e6
parentee0e999936d743b62afa9b3ddb90aece9fbf0ac9 (diff)
downloadvyatta-conntrack-eeb4865ba10e367f8c6025ef165a4cdc4ba531e6.tar.gz
vyatta-conntrack-eeb4865ba10e367f8c6025ef165a4cdc4ba531e6.zip
Revert "Bug #185: ensure nf_conntrack_netlink module is loaded."
This reverts commit abd7059425fceaf2b3c513537c80eef338dbf635. Bring Lithium inline with the changes made in Hydrogen.
-rw-r--r--templates-cfg/system/conntrack/log/node.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/templates-cfg/system/conntrack/log/node.def b/templates-cfg/system/conntrack/log/node.def
index a73beff..83a613e 100644
--- a/templates-cfg/system/conntrack/log/node.def
+++ b/templates-cfg/system/conntrack/log/node.def
@@ -1,4 +1,3 @@
help: Log connection tracking events per protocol
priority: 219 # failure at log shouldnt fail conntrack
-end: [ -d /sys/module/nf_conntrack_netlink ] || sudo modprobe nf_conntrack_netlink
- sudo /opt/vyatta/sbin/vyatta-update-conntrack-log.pl
+end: sudo /opt/vyatta/sbin/vyatta-update-conntrack-log.pl