ia64/xen-unstable

changeset 13270:68f0d46de55a

Xen 3.0.3 pre-pended all configuration prior to the user-specified
args in the boot cmdline. Restore this behaviour to fix
incompatabilities with fragile parsers in some domU kernels.

Signed-off-by: John Levon <john.levon@sun.com>
author kfraser@localhost.localdomain
date Fri Jan 05 11:03:16 2007 +0000 (2007-01-05)
parents 10a6d7eff555
children 36e00d04278d
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Fri Jan 05 10:58:48 2007 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Fri Jan 05 11:03:16 2007 +0000
     1.3 @@ -1113,15 +1113,19 @@ class XendConfig(dict):
     1.4          # configuration
     1.5          log.debug("update_with_image_sxp(%s)" % scrub_password(image_sxp))
     1.6  
     1.7 -        kernel_args = sxp.child_value(image_sxp, 'args', '')
     1.8 +        kernel_args = ""
     1.9  
    1.10          # attempt to extract extra arguments from SXP config
    1.11          arg_ip = sxp.child_value(image_sxp, 'ip')
    1.12          if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
    1.13 -            kernel_args += ' ip=%s' % arg_ip
    1.14 +            kernel_args += 'ip=%s ' % arg_ip
    1.15          arg_root = sxp.child_value(image_sxp, 'root')
    1.16          if arg_root and not re.search(r'root=', kernel_args):
    1.17 -            kernel_args += ' root=%s' % arg_root
    1.18 +            kernel_args += 'root=%s ' % arg_root
    1.19 +
    1.20 +        # user-specified args must come last: previous releases did this and
    1.21 +        # some domU kernels rely upon the ordering.
    1.22 +        kernel_args += sxp.child_value(image_sxp, 'args', '')
    1.23  
    1.24          if bootloader:
    1.25              self['_temp_using_bootloader'] = '1'