[Xen-ia64-devel] [PATCH] pygrub: fix the parameter `default' and `timeout' in elilo.conf

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi,

This patch fixes two issues related to the parameter `default' and
`timeout' in elilo.conf:

- LiloConf.py cannot interpret the parameter `default' and
  `timeout'. The first kernel always boot up even if the second kernel
  is specified by `default'. And `timeout' is ignored.
  
  This issue is introduced by cset 15953:70bb28b62ffb.

- If two kernels or more are installed, the last kernel cannot boot
  up even if it is specified by `default'.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1223020340 -32400
# Node ID 6d99fadd06b54f3725b5ebe6ec16df3ae871d8d5
# Parent  782599274bf9ae8857c55856c9c7fdf082967808
pygrub: fix the parameter `default' and `timeout' in elilo.conf

This patch fixes two issues related to the parameter `default' and
`timeout' in elilo.conf:

- LiloConf.py cannot interpret the parameter `default' and
  `timeout'. The first kernel always boot up even if the second kernel
  is specified by `default'. And `timeout' is ignored.

  This issue is introduced by cset 15953:70bb28b62ffb.

- If two kernels or more are installed, the last kernel cannot boot
  up even if it is specified by `default'.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>

diff -r 782599274bf9 -r 6d99fadd06b5 tools/pygrub/src/LiloConf.py
--- a/tools/pygrub/src/LiloConf.py      Tue Sep 30 10:14:54 2008 +0100
+++ b/tools/pygrub/src/LiloConf.py      Fri Oct 03 16:52:20 2008 +0900
@@ -142,7 +142,7 @@
         self.images.append(image)
 
     def _get_default(self):
-        for i in range(0, len(self.images) - 1):
+        for i in range(len(self.images)):
             if self.images[i].title == self._default:
                 return i
         return 0
@@ -150,8 +150,8 @@
         self._default = val
     default = property(_get_default, _set_default)
 
-    commands = { "default": "self.default",
-                 "timeout": "self.timeout",
+    commands = { "default": "default",
+                 "timeout": "timeout",
                  "prompt": None,
                  "relocatable": None,
                  }

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel