Add some patches to grub.
[people/pmueller/ipfire-2.x.git] / src / patches / grub-0.93-configfile.patch
1 --- grub-0.93/stage2/asm.S.config 2002-12-02 18:18:56.000000000 -0500
2 +++ grub-0.93/stage2/asm.S 2002-12-28 22:01:24.000000000 -0500
3 @@ -97,7 +97,7 @@
4 .string VERSION
5 VARIABLE(config_file)
6 #ifndef STAGE1_5
7 - .string "/boot/grub/menu.lst"
8 + .string "/boot/grub/grub.conf"
9 #else /* STAGE1_5 */
10 .long 0xffffffff
11 .string "/boot/grub/stage2"
12 --- grub-0.93/stage2/builtins.c.config 2002-12-03 23:41:57.000000000 -0500
13 +++ grub-0.93/stage2/builtins.c 2002-12-28 22:01:24.000000000 -0500
14 @@ -3838,7 +3838,7 @@
15
16 /* The prefix was determined. */
17 grub_sprintf (stage2, "%s%s", prefix, "/stage2");
18 - grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
19 + grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
20 *real_config_filename = 0;
21
22 /* Check if stage2 exists. */
23 --- grub-0.93/grub/asmstub.c.config 2002-12-02 18:20:45.000000000 -0500
24 +++ grub-0.93/grub/asmstub.c 2002-12-28 22:01:24.000000000 -0500
25 @@ -71,7 +71,7 @@
26 unsigned long boot_drive = 0;
27 int saved_entryno = 0;
28 char version_string[] = VERSION;
29 -char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
30 +char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
31 unsigned long linux_text_len = 0;
32 char *linux_data_tmp_addr = 0;
33 char *linux_data_real_addr = 0;
34 --- grub-0.93/docs/grub.8.config 2002-12-07 22:17:59.000000000 -0500
35 +++ grub-0.93/docs/grub.8 2002-12-28 22:01:24.000000000 -0500
36 @@ -15,7 +15,7 @@
37 specify stage2 boot_drive [default=0x0]
38 .TP
39 \fB\-\-config\-file\fR=\fIFILE\fR
40 -specify stage2 config_file [default=/boot/grub/menu.lst]
41 +specify stage2 config_file [default=/boot/grub/grub.conf]
42 .TP
43 \fB\-\-device\-map\fR=\fIFILE\fR
44 use the device map file FILE
45 --- grub-0.93/docs/grub.texi.config 2002-12-02 17:35:28.000000000 -0500
46 +++ grub-0.93/docs/grub.texi 2002-12-28 22:01:24.000000000 -0500
47 @@ -989,7 +989,7 @@
48 keys) that will do everything to boot an OS.
49
50 To enable the menu, you need a configuration file,
51 -@file{menu.lst} under the boot directory. We'll analyze an example
52 +@file{grub.conf} under the boot directory. We'll analyze an example
53 file.
54
55 The file first contains some general settings, the menu interface
56 @@ -1596,8 +1596,8 @@
57
58 An absolute file name resembles a Unix absolute file name, using
59 @samp{/} for the directory separator (not @samp{\} as in DOS). One
60 -example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
61 -@file{/boot/grub/menu.lst} in the first partition of the first hard
62 +example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
63 +@file{/boot/grub/grub.conf} in the first partition of the first hard
64 disk. If you omit the device name in an absolute file name, GRUB uses
65 GRUB's @dfn{root device} implicitly. So if you set the root device to,
66 say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
67 @@ -3249,7 +3249,7 @@
68
69 @item --config-file=@var{file}
70 Read the configuration file @var{file} instead of
71 -@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
72 +@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
73 syntax. See @ref{Filesystem}, for more information.
74
75 @item --boot-drive=@var{drive}