vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make menus work again.

Browse source
This commit is contained in:
gord 1999-05-03 22:49:53 +00:00
parent 0efa52337e
commit d654cfa0fd
4 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
1999-05-03 Gordon Matzigkeit <gord@trick.fig.org>
From Pavel Roskin:
* shared_src/shared.h: Redeclare.
* grub/main.c (main): Use strncpy rather than pointer assignment
to set the config file name.
* grub/asmstub.c: Make config_file a static array, not a pointer.
Correct the value of VERSION_STRING.
1999-04-10 Gordon Matzigkeit <gord@trick.fig.org> 1999-04-10 Gordon Matzigkeit <gord@trick.fig.org>
* debian/rules (build): Install into /lib instead of /share. * debian/rules (build): Install into /lib instead of /share.

4
grub/asmstub.c
View file

@ -60,8 +60,8 @@ int grub_stage2 (void);
unsigned long install_partition = 0x20000; unsigned long install_partition = 0x20000;
unsigned long boot_drive = 0; unsigned long boot_drive = 0;
char version_string[] = "0.5"; char version_string[] = VERSION;
char *config_file = "/boot/grub/menu.lst"; char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
/* Emulation requirements. */ /* Emulation requirements. */
char *grub_scratch_mem = 0; char *grub_scratch_mem = 0;

3
grub/main.c
View file

@ -130,7 +130,8 @@ main (int argc, char **argv)
break; break;
case OPT_CONFIG_FILE: case OPT_CONFIG_FILE:
config_file = strdup (optarg); strncpy (config_file, optarg, 127); /* FIXME: arbitrary */
config_file[127] = '\0';
break; break;
case OPT_INSTALL_PARTITION: case OPT_INSTALL_PARTITION:

2
shared_src/shared.h
View file

@ -280,7 +280,7 @@ typedef enum
extern unsigned long install_partition; extern unsigned long install_partition;
extern unsigned long boot_drive; extern unsigned long boot_drive;
extern char version_string[]; extern char version_string[];
extern char *config_file; extern char config_file[];
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
/* If not using config file, this variable is set to zero, /* If not using config file, this variable is set to zero,