diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-11-13 18:10:15 +0000 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-11-13 18:10:15 +0000 |
| commit | 07c965c8cdc35ed20fe1270f7051961e19597c00 (patch) | |
| tree | 61d818737c4aaa89b4ea8ef95a32509b15aceb28 | |
| parent | cca747c4051197f086ee353f6919c32035a50dca (diff) | |
| download | xen-07c965c8cdc35ed20fe1270f7051961e19597c00.tar.gz xen-07c965c8cdc35ed20fe1270f7051961e19597c00.tar.bz2 xen-07c965c8cdc35ed20fe1270f7051961e19597c00.zip | |
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 <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
xen-unstable changeset: 26018:ecc7627ca6d7
Backport-requested-by: Ian Campbell <Ian.Campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-4.2-testing changeset: 25899:dbb1872bbb97
Backport-requested-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -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 3d994b60d2..f65f22cbdd 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -555,7 +555,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 @@ -592,8 +592,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 |