search for: get_entry_idx

...- diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 1845485..eedfdb2 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -613,7 +613,7 @@ def run_grub(file, entry, fs, cfg_args): # set the entry to boot as requested if entry is not None: idx = get_entry_idx(g.cf, entry) - if idx is not None and idx > 0 and idx < len(g.cf.images): + if idx is not None and idx >= 0 and idx < len(g.cf.images): sel = idx if sel == -1:

Fix for pygrub path on Solaris. Signed-off-by: John Levon <john.levon@sun.com> diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -37,7 +37,7 @@ from xen.util.blkif import blkdev_uname_ from xen.util.blkif import blkdev_uname_to_file from xen.util

...%(int(timeout) - mytime)) else: @@ -566,7 +568,7 @@ class Grub: self.selected_image = 0 elif self.selected_image >= len(self.cf.images): self.selected_image = len(self.cf.images) - 1 - + def get_entry_idx(cf, entry): # first, see if the given entry is numeric try: @@ -601,7 +603,7 @@ def run_grub(file, entry, fs, arg): if entry is not None: idx = get_entry_idx(g.cf, entry) if idx is not None and idx > 0 and idx < len(g.cf.images): - sel = idx +...