diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-02-20 11:08:31 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-02-20 11:08:31 +0000 |
| commit | c796f3c14f2103b08ed4a0133b080fafc12ec2c1 (patch) | |
| tree | f6daaf20ec6fafca197734c3dcea07018b3e54e4 /tools/pygrub | |
| parent | 1cd591a504725a6509b1059bf24db53fb5b32603 (diff) | |
| download | xen-c796f3c14f2103b08ed4a0133b080fafc12ec2c1.tar.gz xen-c796f3c14f2103b08ed4a0133b080fafc12ec2c1.tar.bz2 xen-c796f3c14f2103b08ed4a0133b080fafc12ec2c1.zip | |
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@gmail.com>
Diffstat (limited to 'tools/pygrub')
| -rw-r--r-- | tools/pygrub/src/pygrub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index ae15af187e..e4482afeb5 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -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.", |