firewall-init: firewall, firewall.d/functions - removed hash table size opt...

[baggins]

Author: baggins                      Date: Sat Jan  9 14:14:39 2010 GMT
Module: firewall-init                 Tag: HEAD
---- Log message:
- removed hash table size options, set them via modprobe.conf

---- Files affected:
firewall-init:
   firewall (1.8 -> 1.9) 
firewall-init/firewall.d:
   functions (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: firewall-init/firewall
diff -u firewall-init/firewall:1.8 firewall-init/firewall:1.9
--- firewall-init/firewall:1.8	Tue Dec 29 21:52:23 2009
+++ firewall-init/firewall	Sat Jan  9 15:14:33 2010
@@ -33,9 +33,8 @@
 # The ftp/irc options has been removed
 # set them via /etc/modprobe.d/modprobe.conf
 
-# Size (number of entries) of hash table for connection tracking
-# default is 1/16384 of memory
-CONNTRACK_HASHSIZE=
+# The hash table size options has been removed
+# set them via /etc/modprobe.d/modprobe.conf
 
 # Policies for chains:
 # IPv4:

================================================================
Index: firewall-init/firewall.d/functions
diff -u firewall-init/firewall.d/functions:1.19 firewall-init/firewall.d/functions:1.20
--- firewall-init/firewall.d/functions:1.19	Tue Dec 29 23:40:09 2009
+++ firewall-init/firewall.d/functions	Sat Jan  9 15:14:34 2010
@@ -5,8 +5,7 @@
 	local i conn b
 
 	_modprobe die -a x_tables
-	_modprobe die -a nf_conntrack \
-		`[ -z "$CONNTRACK_HASHSIZE" ] || echo "expect_hashsize=$CONNTRACK_HASHSIZE"`
+	_modprobe die -a nf_conntrack
 
 	if [ "$CONNTRACK_MODULES" = "all" -o -z "$CONNTRACK_MODULES" ] ; then
 		conn=""
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/firewall-init/firewall?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/firewall-init/firewall.d/functions?r1=1.19&r2=1.20&f=u