[Lunar-commits] r23664 - lunar-tools/trunk/lnet

[Auke Kok]

Author: sofar
Date: 2007-03-16 17:40:07 +0100 (Fri, 16 Mar 2007)
New Revision: 23664

Modified:
   lunar-tools/trunk/lnet/lnet
Log:
Allow ifplugd to see modified user preference for dhcp client+options (needs change
to ifplugd.action script still pending)


Modified: lunar-tools/trunk/lnet/lnet
===================================================================
--- lunar-tools/trunk/lnet/lnet	2007-03-16 16:15:22 UTC (rev 23663)
+++ lunar-tools/trunk/lnet/lnet	2007-03-16 16:40:07 UTC (rev 23664)
@@ -366,12 +366,14 @@
 				    fi
 					echo "D"
 					echo "Dhcp enabled?           [$(echo $ADDRESS | grep -qi dhcp && echo "Y" || echo "N")]"
-				    if echo $ADDRESS | grep -qi dhcp ; then
+				  fi
+				  if [ "$MANAGER" != "manual" ] ||  echo $ADDRESS | grep -qi dhcp ; then
 					echo "C"
 					echo "Dhcp client             [${DHCP_CLIENT:-dhcpcd}]"
 					echo "O"
 					echo "Dhcp options            [${DHCP_OPTIONS:-}]"
-				    else
+				  fi
+				  if !echo ${ADDRESS:-dhcp} | grep -qi dhcp ; then
 					echo "I"
 					echo "IP Address              [${ADDRESS:-10.0.0.1}]"
 					echo "N"
@@ -380,10 +382,9 @@
 					echo "Broadcast               [${BROADCAST:-10.0.0.255}]"
 					echo "F"
 					echo "Ifconfig options        [${IFCONF_OPTS:-}]"
-				    fi
-				 fi)`
+				  fi
+				 )`
 
-
 	if [ $? != 0 ]; then
 		return
 	fi
@@ -403,6 +404,12 @@
 				 "manual" "do not use ifplugd or wpa_supplicant" \
 				 "ifplugd" "use ifplugd" \
 				 "wpa_supplicant" "Use both ifplugd and wpa_supplicant"`
+		if [ "$MANAGER" == "wpa_supplicant" ] ; then
+			WIRELESS=Y
+		fi
+		if [ "$MANAGER" != "manual" ] ; then
+			ADDRESS=dhcp
+		fi
 		;;
 	W)	if [ "$WIRELESS" == "Y" ]; then
 			WIRELESS=N