From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yu Zhiguo <yuzg@cn.fujitsu.com>
Subject: [PATCH] Don't attach needless options when launch pygrub
Date: Wed, 14 Jul 2010 14:15:20 +0800
Message-ID: <4C3D55F8.9010303@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

We should always run grub if bootloader is specified,
options 'kernel' and 'ramdisk' are needless.

Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com>

diff -r d867eb643fe4 -r 38d9dac1de56 tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py	Tue Jul 13 18:17:28 2010 +0100
+++ b/tools/python/xen/xend/XendBootloader.py	Wed Jul 14 22:18:58 2010 +0800
@@ -24,8 +24,7 @@
 import pty, termios, fcntl
 from xen.lowlevel import ptsname
 
-def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel = '',
-               ramdisk = '', kernel_args = ''):
+def bootloader(blexec, disk, dom, quiet = False, blargs = '', kernel_args = ''):
     """Run the boot loader executable on the given disk and return a
     config image.
     @param blexec  Binary to use as the boot loader
@@ -96,10 +95,6 @@
     (child, m2) = pty.fork()
     if (not child):
         args = [ blexec ]
-        if kernel:
-            args.append("--kernel=%s" % kernel)
-        if ramdisk:
-            args.append("--ramdisk=%s" % ramdisk)
         if kernel_args:
             args.append("--args=%s" % kernel_args)
         if quiet: