[Xen-changelog] [xen-unstable] pygrub: parse xen module option in grub

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1235128111 0
# Node ID 596f21d901f3867f535027066532f8ce7330a129
# Parent  4771bceb188997073b5b93271f31064cd2610dbe
pygrub: parse xen module option in grub

Add function for GrubConf to parse xen module option in grub.
Pygrub should pass args as domUloader did.

Signed-off-by: Wei Kong <weikong.cn@xxxxxxxxx>
---
 tools/pygrub/src/pygrub |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 4771bceb1889 -r 596f21d901f3 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub   Fri Feb 20 11:05:17 2009 +0000
+++ b/tools/pygrub/src/pygrub   Fri Feb 20 11:08:31 2009 +0000
@@ -501,7 +501,7 @@ def get_entry_idx(cf, entry):
 
     return None
 
-def run_grub(file, entry, fs):
+def run_grub(file, entry, fs, arg):
     global g
     global sel
 
@@ -534,7 +534,7 @@ def run_grub(file, entry, fs):
     if img.initrd:
         grubcfg["ramdisk"] = img.initrd[1]
     if img.args:
-        grubcfg["args"] = img.args
+        grubcfg["args"] = img.args + " " + arg
 
     return grubcfg
 
@@ -659,7 +659,7 @@ if __name__ == "__main__":
     chosencfg = sniff_solaris(fs, incfg)
 
     if not chosencfg["kernel"]:
-        chosencfg = run_grub(file, entry, fs)
+        chosencfg = run_grub(file, entry, fs, incfg["args"])
 
     data = fs.open_file(chosencfg["kernel"]).read()
     (tfd, bootcfg["kernel"]) = tempfile.mkstemp(prefix="boot_kernel.",

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