aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pygrub
diff options
context:
space:
mode:
authorMiroslav Rezanina <mrezanin@redhat.com>2011-12-13 15:39:28 +0000
committerMiroslav Rezanina <mrezanin@redhat.com>2011-12-13 15:39:28 +0000
commit2f446676213f6240f106854c8c853c48a8c7ef78 (patch)
tree24881e3265dfb2f457a08f183f85a01ac86e9ba1 /tools/pygrub
parent688a04531743943180a63aae1a8985cfdc3df191 (diff)
downloadxen-2f446676213f6240f106854c8c853c48a8c7ef78.tar.gz
xen-2f446676213f6240f106854c8c853c48a8c7ef78.tar.bz2
xen-2f446676213f6240f106854c8c853c48a8c7ef78.zip
pygrub: Fix "a" entry editing in grub2
When user wants to change entry in grub2 menu in pygrub, there's no response in case of appending command line arguments ('a' key). Append malfunction is caused by change of keyword used for kernel record. Grub uses 'kernel' for line with linux kernel but grub2 uses 'linux' instead. This patch adds checking for both grub 1 and 2 keywords. Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/pygrub')
-rw-r--r--tools/pygrub/src/pygrub2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 2db333e9e2..e14df3f45c 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -522,7 +522,7 @@ class Grub:
# find the kernel line, edit it and then boot
img = self.cf.images[self.selected_image]
for line in img.lines:
- if line.startswith("kernel"):
+ if line.startswith("kernel") or line.startswith("linux"):
l = self.edit_line(line)
if l is not None:
img.set_from_line(l, replace = True)