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

[Auke Kok]

Author: sofar
Date: 2007-03-19 21:52:06 +0100 (Mon, 19 Mar 2007)
New Revision: 23743

Modified:
   lunar-tools/trunk/lnet/lnet
Log:
This was hosed - ADDRESS="" if you turn dhcp off, so don't default to ${ADDRESS:-dhcp} in tests here.


Modified: lunar-tools/trunk/lnet/lnet
===================================================================
--- lunar-tools/trunk/lnet/lnet	2007-03-19 18:44:12 UTC (rev 23742)
+++ lunar-tools/trunk/lnet/lnet	2007-03-19 20:52:06 UTC (rev 23743)
@@ -347,13 +347,13 @@
 					echo "D"
 					echo "Dhcp enabled?           [$(echo $ADDRESS | grep -qi dhcp && echo "Y" || echo "N")]"
 				  fi
-				  if [ "$MANAGER" != "manual" ] ||  echo $ADDRESS | grep -qi dhcp ; then
+				  if [ "$MANAGER" != "manual" ] || [ "$ADDRESS" == "dhcp" ] ; then
 					echo "C"
 					echo "Dhcp client             [${DHCP_CLIENT:-dhcpcd}]"
 					echo "O"
 					echo "Dhcp options            [${DHCP_OPTIONS:--h \`hostname\`}]"
 				  fi
-				  if !echo ${ADDRESS:-dhcp} | grep -qi dhcp ; then
+				  if [ "$ADDRESS" != "dhcp" ] ; then
 					echo "I"
 					echo "IP Address              [${ADDRESS:-10.0.0.1}]"
 					echo "N"