ia64/xen-unstable

changeset 19294:455720d735c7

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>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Mar 09 09:19:10 2009 +0000 (2009-03-09)
parents 8c0b873bffd6
children c4760d58ee6f
files tools/pygrub/src/pygrub
line diff
     1.1 --- a/tools/pygrub/src/pygrub	Mon Mar 09 09:18:08 2009 +0000
     1.2 +++ b/tools/pygrub/src/pygrub	Mon Mar 09 09:19:10 2009 +0000
     1.3 @@ -605,7 +605,7 @@ if __name__ == "__main__":
     1.4      isconfig = False
     1.5  
     1.6      # what was passed in
     1.7 -    incfg = { "kernel": None, "ramdisk": None, "args": None }
     1.8 +    incfg = { "kernel": None, "ramdisk": None, "args": "" }
     1.9      # what grub or sniffing chose
    1.10      chosencfg = { "kernel": None, "ramdisk": None, "args": None }
    1.11      # what to boot
    1.12 @@ -641,7 +641,7 @@ if __name__ == "__main__":
    1.13  
    1.14      # debug
    1.15      if isconfig:
    1.16 -        chosencfg = run_grub(file, entry)
    1.17 +        chosencfg = run_grub(file, entry, fs, incfg["args"])
    1.18          print "  kernel: %s" % chosencfg["kernel"]
    1.19          if img.initrd:
    1.20              print "  initrd: %s" % chosencfg["ramdisk"]