diff options
| author | imp <imp@FreeBSD.org> | 2002-12-12 09:31:10 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2002-12-12 09:31:10 +0000 |
| commit | bcca72ef4de288114951edb5e0a55f8ec80c84a5 (patch) | |
| tree | 15aa79b05e54553b7d748797dd23c2fc568fb0a3 | |
| parent | cf2d9d0438ae055e251233cccefce07e00a6d3cc (diff) | |
| download | FreeBSD-src-bcca72ef4de288114951edb5e0a55f8ec80c84a5.zip FreeBSD-src-bcca72ef4de288114951edb5e0a55f8ec80c84a5.tar.gz | |
o redirect the grep to /dev/null
o use ifn rather than interface in rc.network
o merge into rc.d/network1
Approved by: (re blanket)
| -rw-r--r-- | etc/network.subr | 5 | ||||
| -rwxr-xr-x | etc/pccard_ether | 2 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 5 | ||||
| -rw-r--r-- | etc/rc.network | 2 |
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 |
