File 19291-pygrub.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File 19291-pygrub.patch of Package xen

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1236590350 0
# Node ID 455720d735c7531fe432333d728c3f7f37a082eb
# Parent  8c0b873bffd6e2eb6b2f257efb17e0315273774d
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>

Index: xen-3.3.1-testing/tools/pygrub/src/pygrub
===================================================================
--- xen-3.3.1-testing.orig/tools/pygrub/src/pygrub
+++ xen-3.3.1-testing/tools/pygrub/src/pygrub
@@ -603,7 +603,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
@@ -639,7 +639,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"]

Places

File 19291-pygrub.patch of Package xen

Places