From ff7a7b021275bce3b2b2e11336a970c8041066af Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 12 Aug 2002 20:02:22 +0000
Subject: use -n with iptables -L (#70807)

---
 sysconfig/network-scripts/ifup      | 2 +-
 sysconfig/network-scripts/ifup-post | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 029cf6d9..05731c35 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -127,7 +127,7 @@ fi
 
 # Is there a firewall running, and does it look like one we configured?
 FWACTIVE=
-if iptables -L 2>/dev/null | grep -q RH-Lokkit-0-50-INPUT ; then
+if iptables -L -n 2>/dev/null | grep -q RH-Lokkit-0-50-INPUT ; then
     FWACTIVE=1
 fi
 
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index a2616aae..e36b3a93 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -3,6 +3,9 @@
 cd /etc/sysconfig/network-scripts
 . network-functions
 
+[ -f ../network ] && . ../network
+[ -f ../networking/network ] && . ../networking/network
+
 CONFIG=$1
 source_config
 
@@ -80,7 +83,7 @@ if [ "$PEERDNS" != "no" -o -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ]; then
 fi
 
 if [ "$FIREWALL_MODS" != "no" -a -f /etc/sysconfig/ipchains ] && \
-      iptables -L 2>/dev/null | grep -q RH-Lokkit-0-50-INPUT ; then
+      iptables -L -n 2>/dev/null | grep -q RH-Lokkit-0-50-INPUT ; then
 	ns=`awk '/^nameserver / { print $2 }' /etc/resolv.conf`
 	if [ -n "$ns" ]; then
 		for nameserver in $ns ; do
-- 
cgit v1.2.1