From 34b4264ecf4d314283faff10e11073e95cb7ab2a Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Tue, 31 Aug 2010 16:08:14 -0700
Subject: Fix 6125: iptables errors on boot up of mendocino Shorten chain from
 VYATTA_PRE_CT_PREROUTING_HOOK to VYATTA_CT_PREROUTING_HOOK

---
 scripts/firewall/firewall.init.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/firewall/firewall.init.in b/scripts/firewall/firewall.init.in
index 040078b..5228c66 100644
--- a/scripts/firewall/firewall.init.in
+++ b/scripts/firewall/firewall.init.in
@@ -51,24 +51,24 @@ start () {
 
     # set up notrack chains/rules for IPv4
     # by default, nothing is tracked.
-    iptables -t raw -N VYATTA_PRE_CT_PREROUTING_HOOK
-    iptables -t raw -A VYATTA_PRE_CT_PREROUTING_HOOK -j RETURN
-    iptables -t raw -A PREROUTING -j VYATTA_PRE_CT_PREROUTING_HOOK
+    iptables -t raw -N VYATTA_CT_PREROUTING_HOOK
+    iptables -t raw -A VYATTA_CT_PREROUTING_HOOK -j RETURN
+    iptables -t raw -A PREROUTING -j VYATTA_CT_PREROUTING_HOOK
     iptables -t raw -A PREROUTING -j NOTRACK
-    iptables -t raw -N VYATTA_PRE_CT_OUTPUT_HOOK
-    iptables -t raw -A VYATTA_PRE_CT_OUTPUT_HOOK -j RETURN
-    iptables -t raw -A OUTPUT -j VYATTA_PRE_CT_OUTPUT_HOOK
+    iptables -t raw -N VYATTA_CT_OUTPUT_HOOK
+    iptables -t raw -A VYATTA_CT_OUTPUT_HOOK -j RETURN
+    iptables -t raw -A OUTPUT -j VYATTA_CT_OUTPUT_HOOK
     iptables -t raw -A OUTPUT -j NOTRACK
 
     if [ -d /proc/sys/net/ipv6 ] ; then
 	# set up notrack chains/rules for IPv6
-        ip6tables -t raw -N VYATTA_PRE_CT_PREROUTING_HOOK
-        ip6tables -t raw -A VYATTA_PRE_CT_PREROUTING_HOOK -j RETURN
-        ip6tables -t raw -A PREROUTING -j VYATTA_PRE_CT_PREROUTING_HOOK
+        ip6tables -t raw -N VYATTA_CT_PREROUTING_HOOK
+        ip6tables -t raw -A VYATTA_CT_PREROUTING_HOOK -j RETURN
+        ip6tables -t raw -A PREROUTING -j VYATTA_CT_PREROUTING_HOOK
         ip6tables -t raw -A PREROUTING -j NOTRACK
-        ip6tables -t raw -N VYATTA_PRE_CT_OUTPUT_HOOK
-        ip6tables -t raw -A VYATTA_PRE_CT_OUTPUT_HOOK -j RETURN
-        ip6tables -t raw -A OUTPUT -j VYATTA_PRE_CT_OUTPUT_HOOK
+        ip6tables -t raw -N VYATTA_CT_OUTPUT_HOOK
+        ip6tables -t raw -A VYATTA_CT_OUTPUT_HOOK -j RETURN
+        ip6tables -t raw -A OUTPUT -j VYATTA_CT_OUTPUT_HOOK
         ip6tables -t raw -A OUTPUT -j NOTRACK
 
 	# set up post-firewall hook for IPv6
-- 
cgit v1.2.3