[Xen-changelog] [xen-3.0.4-testing] Xen 3.0.3 pre-pended all configuration prior to the user-specified

["Xen patchbot-3.0.4-testing" <patchbot-3.0.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1167995708 0
# Node ID 0603ab5b0ede4c6040090a37feac236463ad92c0
# Parent  5e44bd5ef9b814904024f167c10b4dd1fdcc1a10
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@xxxxxxx>

Based on xen-unstable changeset 13234:68f0d46de55ab1e158c19e7e5890902e05d6f623
---
 tools/python/xen/xend/XendConfig.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff -r 5e44bd5ef9b8 -r 0603ab5b0ede tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Fri Jan 05 11:13:10 2007 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Fri Jan 05 11:15:08 2007 +0000
@@ -1104,15 +1104,20 @@ class XendConfig(dict):
 
         self['PV_kernel'] = sxp.child_value(image_sxp, 'kernel','')
         self['PV_ramdisk'] = sxp.child_value(image_sxp, 'ramdisk','')
-        kernel_args = sxp.child_value(image_sxp, 'args', '')
+        kernel_args = ""
         
         # attempt to extract extra arguments from SXP config
         arg_ip = sxp.child_value(image_sxp, 'ip')
         if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
-            kernel_args += ' ip=%s' % arg_ip
+            kernel_args += 'ip=%s ' % arg_ip
         arg_root = sxp.child_value(image_sxp, 'root')
         if arg_root and not re.search(r'root=', kernel_args):
-            kernel_args += ' root=%s' % arg_root
+            kernel_args += 'root=%s ' % arg_root
+
+        # user-specified args must come last: previous releases did this and
+        # some domU kernels rely upon the ordering.
+        kernel_args += sxp.child_value(image_sxp, 'args', '')
+
         self['PV_args'] = kernel_args
 
         # Store image SXP in python dictionary format

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog