extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-21 02:08:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update lib.cli to account for mindless renaming of /proc/net/ip_conntrack to /proc/net/nf_conntrack

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5565 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-18 02:57:30 +00:00
parent 2f7c8f9120
commit f136f6c26d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/changelog.txt
View File

@ -2,6 +2,9 @@ Changes in 3.4.2
1) Update modules file for 2.6.20 module madness. 1) Update modules file for 2.6.20 module madness.
2) Update /sbin/shorewall[-lite] to account for mindless renaming of
/proc/net/ip_conntrack to /proc/net/nf_conntrack.
Changes in 3.4.1 Changes in 3.4.1
1) Add rest of proxy arp fix. 1) Add rest of proxy arp fix.

4
Shorewall/lib.cli
View File

@ -445,7 +445,7 @@ show_command() {
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && usage 1
echo "$PRODUCT $version Connections at $HOSTNAME - $(date)" echo "$PRODUCT $version Connections at $HOSTNAME - $(date)"
echo echo
cat /proc/net/ip_conntrack [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
;; ;;
nat) nat)
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && usage 1
@ -645,7 +645,7 @@ dump_command() {
$IPTABLES -t mangle -L $IPT_OPTIONS $IPTABLES -t mangle -L $IPT_OPTIONS
heading "Conntrack Table" heading "Conntrack Table"
cat /proc/net/ip_conntrack [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
heading "IP Configuration" heading "IP Configuration"
ip addr ls ip addr ls

4
Shorewall/releasenotes.txt
View File

@ -33,6 +33,10 @@ Problems corrected in Shorewall 3.4.2
1) The /usr/share/shorewall[-lite]/modules file has been updated for 1) The /usr/share/shorewall[-lite]/modules file has been updated for
kernel 2.6.20. kernel 2.6.20.
2) The /proc/net/ip_conntrack pseudo-file has been inexplicably
renamed /proc/net/nf_conntrack in kernel 2.6.20. The lib.cli
library has been updated to look for both files.
Migration Considerations: Migration Considerations:
If you are migrating from a Shorewall version earlier than 3.2.0 then If you are migrating from a Shorewall version earlier than 3.2.0 then