ia64/xen-unstable

changeset 2610:da2af6f3a95e

bitkeeper revision 1.1159.103.3 (4163f948kcyGWcvXIMl2qjnflmWhvQ)

Make the default for ip none instead of dhcp.
Fix variable name for dlist_err errback.
author mjw@wray-m-3.hpl.hp.com
date Wed Oct 06 13:55:20 2004 +0000 (2004-10-06)
parents 03d1ce22b0b2
children 1314598e0d84 805372fcdaa4
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Wed Oct 06 13:54:05 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Wed Oct 06 13:55:20 2004 +0000
     1.3 @@ -1004,7 +1004,7 @@ class XendDomainInfo:
     1.4                  log.warning("Unknown config field %s", field_name)
     1.5              index[field_name] = field_index + 1
     1.6          d = defer.DeferredList(dlist, fireOnOneErrback=1)
     1.7 -        deferred.addErrback(dlist_err)
     1.8 +        d.addErrback(dlist_err)
     1.9          return d
    1.10  
    1.11  
    1.12 @@ -1018,7 +1018,7 @@ def vm_image_linux(vm, image):
    1.13      """
    1.14      kernel = sxp.child_value(image, "kernel")
    1.15      cmdline = ""
    1.16 -    ip = sxp.child_value(image, "ip", "dhcp")
    1.17 +    ip = sxp.child_value(image, "ip", None)
    1.18      if ip:
    1.19          cmdline += " ip=" + ip
    1.20      root = sxp.child_value(image, "root")