File 26018-pygrub_correct_typo_in_--args_assignment.... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File 26018-pygrub_correct_typo_in_--args_assignment.patch of Package xen (Revision c4ffa4f837a89d82db04072916d9f412)

Currently displaying revision c4ffa4f837a89d82db04072916d9f412 , Show latest

changeset:   26018:ecc7627ca6d7
tag:         tip
user:        Olaf Hering <olaf@aepfle.de>
date:        Tue Oct 09 09:18:42 2012 +0100
files:       tools/pygrub/src/pygrub
description:
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>

diff -r c9f621893a05 -r ecc7627ca6d7 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub	Mon Oct 08 14:36:31 2012 +0100
+++ b/tools/pygrub/src/pygrub	Tue Oct 09 09:18:42 2012 +0100
@@ -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

Places

File 26018-pygrub_correct_typo_in_--args_assignment.patch of Package xen (Revision c4ffa4f837a89d82db04072916d9f412)

Places