firewall-init: firewall.d/functions - remove no logner recognized modprobe ...

[baggins]

Author: baggins                      Date: Tue Dec 29 19:33:12 2009 GMT
Module: firewall-init                 Tag: HEAD
---- Log message:
- remove no logner recognized modprobe option

---- Files affected:
firewall-init/firewall.d:
   functions (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: firewall-init/firewall.d/functions
diff -u firewall-init/firewall.d/functions:1.14 firewall-init/firewall.d/functions:1.15
--- firewall-init/firewall.d/functions:1.14	Sun Oct 16 21:06:44 2005
+++ firewall-init/firewall.d/functions	Tue Dec 29 20:33:07 2009
@@ -2,8 +2,8 @@
 {
 	typeset i conn
 
-	_modprobe die -k -a ip_tables
-	_modprobe die -k -a ip_conntrack \
+	_modprobe die -a ip_tables
+	_modprobe die -a ip_conntrack \
 		`[ -z "$CONNTRACK_HASHSIZE" ] || echo "hashsize=$CONNTRACK_HASHSIZE"`
 
 	if [ "$CONNTRACK_MODULES" = "all" -o -z "$CONNTRACK_MODULES" ] ; then
@@ -11,13 +11,13 @@
 	    for i in /lib/modules/`uname -r`/kernel/net/ipv4/netfilter/ip_conntrack_*.{k,}o{.gz,} ; do
 		    [ -f "$i" ] && conn="$conn `echo $i | awk '!/ftp|irc|egg/ { gsub(/.*\//,"") ; gsub(/\.[k]o(\.gz)$/,"") ; print $1 }'`"
 	    done
-	    _modprobe die -k -a $conn
+	    _modprobe die -a $conn
 	elif [ "$CONNTRACK_MODULES" != "none" ] ; then
 	    conn=""
 	    for i in $CONNTRACK_MODULES ; do
 		    conn="$conn ip_conntrack_$i"
 	    done
-	    _modprobe die -k -a $conn
+	    _modprobe die -a $conn
 	fi
 
 	if echo "$ipv4_TABLES" | awk '!/nat/ {exit 1}' ; then
@@ -26,20 +26,20 @@
 		for i in /lib/modules/`uname -r`/kernel/net/ipv4/netfilter/ip_nat_*.{k,}o{.gz,} ; do
 			[ -f "$i" ] && conn="$conn `echo $i | awk '!/ftp|irc/ { gsub(/.*\//,"") ; gsub(/\.[k]o(\.gz)$/,"") ; print $1 }'`"
 		done
-		_modprobe die -k -a $conn
+		_modprobe die -a $conn
 	    elif [ "$NAT_MODULES" != "none" ] ; then
 		conn=""
 		for i in $NAT_MODULES ; do
 			    conn="$conn ip_nat_$i"
 		done
-		_modprobe die -k -a $conn
+		_modprobe die -a $conn
 	    fi
 	fi
 }
 
 ipv6_load_modules()
 {
-	_modprobe die -k -a ip6_tables
+	_modprobe die -a ip6_tables
 }
 
 ipv4_remove_modules()
================================================================

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