summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/network.subr5
-rwxr-xr-xetc/pccard_ether2
-rw-r--r--etc/rc.d/network15
-rw-r--r--etc/rc.network2
4 files changed, 12 insertions, 2 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 4887042..5e68a3d 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -146,6 +146,11 @@ network_start()
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
+ if ifconfig ${ifn} | grep -s UP, > /dev/null 2>&1; then
+ # Interface is already up, so ignore it.
+ continue;
+ fi
+
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
eval showstat_$ifn=1
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 93c7ca5..697b1c1 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -65,7 +65,7 @@ esac
case ${startstop} in
[Ss][Tt][Aa][Rr][Tt] | '')
- if ifconfig ${interface} | grep -s UP,; then
+ if ifconfig ${interface} | grep -s UP, > /dev/null 2>&1; then
# Interface is already up, so ignore it.
exit 0
fi
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 4887042..5e68a3d 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -146,6 +146,11 @@ network_start()
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
+ if ifconfig ${ifn} | grep -s UP, > /dev/null 2>&1; then
+ # Interface is already up, so ignore it.
+ continue;
+ fi
+
if [ -r /etc/start_if.${ifn} ]; then
. /etc/start_if.${ifn}
eval showstat_$ifn=1
diff --git a/etc/rc.network b/etc/rc.network
index 3d6282f..845dff4 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -209,7 +209,7 @@ network_pass1() {
dhcp_interfaces=""
for ifn in ${network_interfaces}; do
- if ifconfig ${interface} | grep -s UP,; then
+ if ifconfig ${ifn} | grep -s UP, > /dev/null 2>&1; then
# Interface is already up, so ignore it.
continue;
fi
OpenPOWER on IntegriCloud