[Xen-changelog] [xen-3.0.5-testing] xend: Don't use -q flag to bootloader if activating text console.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1177683168 -3600
# Node ID 1634486b2a5ca28e0463218f6e8d92a3a6c1259a
# Parent  0063e11206d5488c3b99646de0eac1ef5c835a32
xend: Don't use -q flag to bootloader if activating text console.

In Xen 3.0.3 series release, if one did 'xm create -c someguest' then
you would be shown the pygrub boot menu, allowing one to pick a
kernel. If you didn't use the -c arg, then it'd just pick the default
kernel.

In Xen 3.0.5 testing, xm is forcing the addition of the '-q' flag
whenever the 'bootargs' parameter is not given in the config file. So
if one does not have 'bootargs' specified, and one uses 'xm create -c
someguest' you never get to see the pygrub boot menu.

This patch fixes 'xm create' so that it does not add the '-q' flag
to the bootloader args, if the '-c' flag is given to xm create. This
makes the default user experiance operate closer to user
expectations.

Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
 tools/python/xen/xm/create.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 0063e11206d5 -r 1634486b2a5c tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Fri Apr 27 15:09:39 2007 +0100
+++ b/tools/python/xen/xm/create.py     Fri Apr 27 15:12:48 2007 +0100
@@ -777,8 +777,11 @@ def make_config(vals):
         config.append(['bootloader', vals.bootloader])
         if vals.bootargs:
             config.append(['bootloader_args', vals.bootargs])
-        else: 
-            config.append(['bootloader_args', '-q'])        
+        else:
+            if vals.console_autoconnect:
+                config.append(['bootloader_args', ''])
+            else:
+                config.append(['bootloader_args', '-q'])
     config.append(['image', config_image])
 
     config_devs = []

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