aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2002-08-12 20:02:22 +0000
committerBill Nottingham <notting@redhat.com>2002-08-12 20:02:22 +0000
commitff7a7b021275bce3b2b2e11336a970c8041066af (patch)
treee224b8f966f18a372a43d807ff2f5d9ea867b0dc
parentad0afc3342d0653e9a6da8189cd4c9edcbafd21b (diff)
downloadinitscripts-ff7a7b021275bce3b2b2e11336a970c8041066af.tar
initscripts-ff7a7b021275bce3b2b2e11336a970c8041066af.tar.gz
initscripts-ff7a7b021275bce3b2b2e11336a970c8041066af.tar.bz2
initscripts-ff7a7b021275bce3b2b2e11336a970c8041066af.tar.xz
initscripts-ff7a7b021275bce3b2b2e11336a970c8041066af.zip
use -n with iptables -L (#70807)
-rwxr-xr-xsysconfig/network-scripts/ifup2
-rwxr-xr-xsysconfig/network-scripts/ifup-post5
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