get the ip address of the device directly so that things work if we're running

on a machine using dhcp that doesn't have reverse dns (#103371)

1 files changed, 6 insertions, 3 deletions

diff --git a/anaconda b/anaconda
index 898b758e6..04437168d 100755
--- a/anaconda
+++ b/anaconda
@@ -112,10 +112,13 @@ def startVNCServer(vncpassword=None, root='/', vncconnecthost=None,
 	else:
 	    for dev in netinfo.netdevices.keys():
 		try:
-		    ip = netinfo.netdevices[dev].get("ipaddr")
-		except:
+                    ip = isys.getIPAddress(dev)
+                    log("ip of %s is %s" %(dev, ip))
+		except Exception, e:
+                    log("Got an exception trying to get the ip addr of %s: "
+                        "%s" %(dev, e))
 		    continue
-		if ip == '127.0.0.1':
+		if ip == '127.0.0.1' or ip is None:
 		    continue
 		srvname = ip
 		break