Author: baggins Date: Sun Oct 16 19:06:49 2005 GMT
Module: firewall-init Tag: HEAD
---- Log message:
- consistent regexps for compressed modules
---- Files affected:
firewall-init/firewall.d:
functions (1.13 -> 1.14)
---- Diffs:
================================================================
Index: firewall-init/firewall.d/functions
diff -u firewall-init/firewall.d/functions:1.13
firewall-init/firewall.d/functions:1.14
--- firewall-init/firewall.d/functions:1.13 Sat Oct 15 17:16:12 2005
+++ firewall-init/firewall.d/functions Sun Oct 16 21:06:44 2005
@@ -9,7 +9,7 @@
if [ "$CONNTRACK_MODULES" = "all" -o -z "$CONNTRACK_MODULES" ] ; then
conn=""
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.*$/,"") ; print $1 }'`"
+ [ -f "$i" ] && conn="$conn `echo $i | awk '!/ftp|irc|egg/ {
gsub(/.*\//,"") ; gsub(/\.[k]o(\.gz)$/,"") ; print $1 }'`"
done
_modprobe die -k -a $conn
elif [ "$CONNTRACK_MODULES" != "none" ] ; then
@@ -24,7 +24,7 @@
if [ "$NAT_MODULES" = "all" -o -z "$NAT_MODULES" ] ; then
conn=""
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.*$/,"") ; print $1 }'`"
+ [ -f "$i" ] && conn="$conn `echo $i | awk '!/ftp|irc/ {
gsub(/.*\//,"") ; gsub(/\.[k]o(\.gz)$/,"") ; print $1 }'`"
done
_modprobe die -k -a $conn
elif [ "$NAT_MODULES" != "none" ] ; then
@@ -231,4 +231,4 @@
}
# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4
+# vi:syntax=sh:ts=8:sw=4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/firewall-init/firewall.d/functions?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
