SVN: rc-scripts/trunk/sysconfig/network-scripts/functions.network

[gotar]

Author: gotar
Date: Mon Nov 16 15:00:16 2009
New Revision: 10968

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
- it's common for WiFi that all the methods of link state determinaion fail,
  don't abort dhclient in such case


Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network	Mon Nov 16 15:00:16 2009
@@ -27,7 +27,7 @@
 	# and forgot to alter DEVICE= line you won't accidentally bring down eth0
 	# while executing ifdown eth1. We do that only if configuration file exists
 	# (sometimes ifcfg-xyz isn't needed at all like server-side pppoe pppX interfaces)
-	if [ "$foundconfig" -eq "1" -a "$DEVICE" -a  "$DEVNAME" != "$DEVICE" ]; then
+	if [ "$foundconfig" -eq "1" -a "$DEVICE" -a "$DEVNAME" != "$DEVICE" ]; then
 		echo >&2 "$0: DEVICE specified in $CONFIG does not match filename. Aborting!"
 		exit 1
 	fi
@@ -618,6 +618,10 @@
 				usleep 500000
 				timeout=$((timeout+1))
 			done
+			# do not abort dhclient if all the checks are unsupported
+			if [ $m -eq 2 ] && [ $i -eq 2 ] && [ $e -eq 2 ]; then
+				return 2
+			fi
 			return 0
 		fi
 	fi