o Don't do anything if the interface is already up.

o Only delay in pccard_ether when we're doing dhcp and starting the interface.

Approved: (re blanket for devd)

1 files changed, 5 insertions, 0 deletions

diff --git a/etc/rc.network b/etc/rc.network
index 925876bbacca..3d6282f3442d 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -209,6 +209,11 @@ network_pass1() {
 
 	dhcp_interfaces=""
 	for ifn in ${network_interfaces}; do
+		if ifconfig ${interface} | grep -s UP,; 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