ia64/xen-unstable

changeset 12745:ef1dadde3631

[XEND] Reapply fix for ever expanding kernel_args in XendConfig

Signed-off-by: Alastair Tse <atse@xensource.com>
author Alastair Tse <atse@xensource.com>
date Fri Dec 01 13:55:28 2006 +0000 (2006-12-01)
parents d0ade847f886
children 43c8cb5a895c
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Fri Dec 01 13:53:04 2006 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Fri Dec 01 13:55:28 2006 +0000
     1.3 @@ -554,7 +554,7 @@ class XendConfig(dict):
     1.4  
     1.5              # attempt to extract extra arguments from SXP config
     1.6              arg_ip = sxp.child_value(image_sxp, 'ip')
     1.7 -            if arg_ip and not re.search(r'ip=[0-9\.]+', kernel_args):
     1.8 +            if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
     1.9                  kernel_args += ' ip=%s' % arg_ip
    1.10              arg_root = sxp.child_value(image_sxp, 'root')
    1.11              if arg_root and not re.search(r'root=[^ ]+', kernel_args):
    1.12 @@ -1019,7 +1019,7 @@ class XendConfig(dict):
    1.13          
    1.14          # attempt to extract extra arguments from SXP config
    1.15          arg_ip = sxp.child_value(image_sxp, 'ip')
    1.16 -        if arg_ip and not re.search(r'ip=[0-9\.]', kernel_args):
    1.17 +        if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
    1.18              kernel_args += ' ip=%s' % arg_ip
    1.19          arg_root = sxp.child_value(image_sxp, 'root')
    1.20          if arg_root and not re.search(r'root=', kernel_args):