[patch] fixed menu so you can use it...

[patch] fixed menu so you can use it...

[Vesa Jääskeläinen]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

Hi,

I made some fixes to menu. Now you can even select a menu entry :).

There were also some odd code in elsewhere so I fixed some issues
related to those too.

Thanks,
Vesa Jääskeläinen

[-- Attachment #2: grub2-menufix.diff --]
[-- Type: text/plain, Size: 1181 bytes --]

Index: ChangeLog
===================================================================
RCS file: /sources/grub/grub2/ChangeLog,v
retrieving revision 1.228
diff -u -r1.228 ChangeLog
--- ChangeLog	31 Mar 2006 14:26:33 -0000	1.228
+++ ChangeLog	1 Apr 2006 14:28:58 -0000
@@ -1,3 +1,9 @@
+2006-04-01  Vesa Jaaskelainen  <chaac@nic.fi>
+
+	* normal/main.c (grub_normal_menu_addentry): Fixed menu size
+	calculation.
+	(read_config_file): Made it to close file before returning.
+
 2006-03-31  Vesa Jaaskelainen  <chaac@nic.fi>
 
 	* DISTLIST: Added include/grub/i386/pc/vbeblit.h,
Index: normal/main.c
===================================================================
RCS file: /sources/grub/grub2/normal/main.c,v
retrieving revision 1.14
diff -u -r1.14 main.c
--- normal/main.c	17 Jan 2006 09:50:47 -0000	1.14
+++ normal/main.c	1 Apr 2006 14:28:59 -0000
@@ -153,6 +153,8 @@
   (*last)->next = 0;
   (*last)->sourcecode = sourcecode;
 
+  current_menu->size++;
+
   return GRUB_ERR_NONE;
 }
 
@@ -223,10 +225,8 @@
       grub_script_free (parsed_script);
     }
 
-  return newmenu;
-
   grub_file_close (file);
-  return 0;
+  return newmenu;
 }
 
 /* This starts the normal mode.  */

Re: [patch] fixed menu so you can use it...

[Marco Gerards]

Vesa Jääskeläinen <chaac@nic.fi> writes:

Hi Vesa,

> I made some fixes to menu. Now you can even select a menu entry :).
>
> There were also some odd code in elsewhere so I fixed some issues
> related to those too.

This looks fine to me.  Please apply it.

Thanks,
Marco