[Xen-changelog] [xen-unstable] [XEND] Reapply fix for ever expanding kernel_args in XendConfig

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Node ID ef1dadde363179f591543c1283a370578d8dc520
# Parent  d0ade847f8867ca79c6bf949aa8d7fbd60f1c97f
[XEND] Reapply fix for ever expanding kernel_args in XendConfig

Signed-off-by: Alastair Tse <atse@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r d0ade847f886 -r ef1dadde3631 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Fri Dec 01 13:53:04 2006 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Fri Dec 01 13:55:28 2006 +0000
@@ -554,7 +554,7 @@ class XendConfig(dict):
 
             # 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=[0-9\.]+', kernel_args):
+            if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
                 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):
@@ -1019,7 +1019,7 @@ class XendConfig(dict):
         
         # 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=[0-9\.]', kernel_args):
+        if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
             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):

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