bitkeeper revision 1.1159.103.3 (4163f948kcyGWcvXIMl2qjnflmWhvQ)

Make the default for ip none instead of dhcp.
Fix variable name for dlist_err errback.

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index c81c2a05163e6e67487f7a544511c7fdbd9a1c63..dad6c5b452b86321d897d03fb7659ac550bd3244 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1004,7 +1004,7 @@ class XendDomainInfo:
                 log.warning("Unknown config field %s", field_name)
             index[field_name] = field_index + 1
         d = defer.DeferredList(dlist, fireOnOneErrback=1)
-        deferred.addErrback(dlist_err)
+        d.addErrback(dlist_err)
         return d
 
 
@@ -1018,7 +1018,7 @@ def vm_image_linux(vm, image):
     """
     kernel = sxp.child_value(image, "kernel")
     cmdline = ""
-    ip = sxp.child_value(image, "ip", "dhcp")
+    ip = sxp.child_value(image, "ip", None)
     if ip:
         cmdline += " ip=" + ip
     root = sxp.child_value(image, "root")