From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 9 Mar 2009 09:19:10 +0000 (+0000)
Subject: pygrub: Enable domU boot without xen specific arg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13994^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=178897b9f259c07bd8b64ce3bc0737e1c070c821;p=xen.git

pygrub: Enable domU boot without xen specific arg

This patch makes domUs bring up without xen specific args to guest
kernels. A domU should be bootable without args parameter because
tools/examples/xmexample1 doesn't have one.

Signed-off-by: INAKOSHI Hiroya <inakoshi.hiroya@jp.fujitsu.com>
---

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index e4482afeb5..0bd4578b9e 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -605,7 +605,7 @@ if __name__ == "__main__":
     isconfig = False
 
     # what was passed in
-    incfg = { "kernel": None, "ramdisk": None, "args": None }
+    incfg = { "kernel": None, "ramdisk": None, "args": "" }
     # what grub or sniffing chose
     chosencfg = { "kernel": None, "ramdisk": None, "args": None }
     # what to boot
@@ -641,7 +641,7 @@ if __name__ == "__main__":
 
     # debug
     if isconfig:
-        chosencfg = run_grub(file, entry)
+        chosencfg = run_grub(file, entry, fs, incfg["args"])
         print "  kernel: %s" % chosencfg["kernel"]
         if img.initrd:
             print "  initrd: %s" % chosencfg["ramdisk"]