From 4fbfaa77c18cf4f1a36f0ae08cbcbc72341d550c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 26 Oct 2012 16:45:34 +0100 Subject: [PATCH] pygrub: correct typo in --args assignment If pygrub was called with --args="some thing", then this string should be append to the kernel command line. But the last changeset 25941:795c493fe561 contained a typo, it assigns 'args' instead of 'arg'. Rename the local variable which holds the string from the domain config file to avoid further confusion. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell xen-unstable changeset: 26018:ecc7627ca6d7 Backport-requested-by: Ian Campbell Committed-by: Ian Jackson --- tools/pygrub/src/pygrub | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index fc55d903e1..295fde071a 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -585,7 +585,7 @@ def get_entry_idx(cf, entry): return None -def run_grub(file, entry, fs, arg): +def run_grub(file, entry, fs, cfg_args): global g global sel @@ -622,8 +622,8 @@ def run_grub(file, entry, fs, arg): grubcfg["ramdisk"] = img.initrd[1] if img.args: grubcfg["args"] += img.args - if arg: - grubcfg["args"] += " " + args + if cfg_args: + grubcfg["args"] += " " + cfg_args return grubcfg