Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 80693 | Differences between
and this patch

Collapse All | Expand All

(-)grub-0.96.old/docs/grub.8 (-1 / +1 lines)
Lines 15-21 Link Here
15
specify stage2 boot_drive [default=0x0]
15
specify stage2 boot_drive [default=0x0]
16
.TP
16
.TP
17
\fB\-\-config\-file\fR=\fIFILE\fR
17
\fB\-\-config\-file\fR=\fIFILE\fR
18
specify stage2 config_file [default=/boot/grub/menu.lst]
18
specify stage2 config_file [default=/boot/grub/grub.conf]
19
.TP
19
.TP
20
\fB\-\-device\-map\fR=\fIFILE\fR
20
\fB\-\-device\-map\fR=\fIFILE\fR
21
use the device map file FILE
21
use the device map file FILE
(-)grub-0.96.old/docs/grub.info (-4 / +4 lines)
Lines 1147-1153 Link Here
1147
(*note Menu interface::) from which you can select an item (using arrow
1147
(*note Menu interface::) from which you can select an item (using arrow
1148
keys) that will do everything to boot an OS.
1148
keys) that will do everything to boot an OS.
1149
1149
1150
   To enable the menu, you need a configuration file, `menu.lst' under
1150
   To enable the menu, you need a configuration file, `grub.conf' under
1151
the boot directory. We'll analyze an example file.
1151
the boot directory. We'll analyze an example file.
1152
1152
1153
   The file first contains some general settings, the menu interface
1153
   The file first contains some general settings, the menu interface
Lines 1373-1379 Link Here
1373
     foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\
1373
     foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\
1374
             :bf=/nbgrub:\
1374
             :bf=/nbgrub:\
1375
             :tc=.allhost:\
1375
             :tc=.allhost:\
1376
             :T150="(nd)/tftpboot/menu.lst.foo":
1376
             :T150="(nd)/tftpboot/grub.conf.foo":
1377
1377
1378
   Note that you should specify the drive name `(nd)' in the name of
1378
   Note that you should specify the drive name `(nd)' in the name of
1379
the configuration file. This is because you might change the root drive
1379
the configuration file. This is because you might change the root drive
Lines 1693-1699 Link Here
1693
1693
1694
   An absolute file name resembles a Unix absolute file name, using `/'
1694
   An absolute file name resembles a Unix absolute file name, using `/'
1695
for the directory separator (not `\' as in DOS). One example is
1695
for the directory separator (not `\' as in DOS). One example is
1696
`(hd0,0)/boot/grub/menu.lst'. This means the file `/boot/grub/menu.lst'
1696
`(hd0,0)/boot/grub/grub.conf'. This means the file `/boot/grub/grub.conf'
1697
in the first partition of the first hard disk. If you omit the device
1697
in the first partition of the first hard disk. If you omit the device
1698
name in an absolute file name, GRUB uses GRUB's "root device"
1698
name in an absolute file name, GRUB uses GRUB's "root device"
1699
implicitly. So if you set the root device to, say, `(hd1,0)' by the
1699
implicitly. So if you set the root device to, say, `(hd1,0)' by the
Lines 3405-3411 Link Here
3405
     grub shell just ignores this option.
3405
     grub shell just ignores this option.
3406
3406
3407
`--config-file=FILE'
3407
`--config-file=FILE'
3408
     Read the configuration file FILE instead of `/boot/grub/menu.lst'.
3408
     Read the configuration file FILE instead of `/boot/grub/grub.conf'.
3409
     The format is the same as the normal GRUB syntax. See *Note
3409
     The format is the same as the normal GRUB syntax. See *Note
3410
     Filesystem::, for more information.
3410
     Filesystem::, for more information.
3411
3411
(-)grub-0.96.old/docs/grub.texi (-5 / +5 lines)
Lines 1265-1271 Link Here
1265
keys) that will do everything to boot an OS.
1265
keys) that will do everything to boot an OS.
1266
1266
1267
To enable the menu, you need a configuration file,
1267
To enable the menu, you need a configuration file,
1268
@file{menu.lst} under the boot directory. We'll analyze an example
1268
@file{grub.conf} under the boot directory. We'll analyze an example
1269
file.
1269
file.
1270
1270
1271
The file first contains some general settings, the menu interface
1271
The file first contains some general settings, the menu interface
Lines 1538-1544 Link Here
1538
foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\
1538
foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\
1539
        :bf=/nbgrub:\
1539
        :bf=/nbgrub:\
1540
        :tc=.allhost:\
1540
        :tc=.allhost:\
1541
        :T150="(nd)/tftpboot/menu.lst.foo":
1541
        :T150="(nd)/tftpboot/grub.conf.foo":
1542
@end group
1542
@end group
1543
@end example
1543
@end example
1544
1544
Lines 1882-1889 Link Here
1882
1882
1883
An absolute file name resembles a Unix absolute file name, using
1883
An absolute file name resembles a Unix absolute file name, using
1884
@samp{/} for the directory separator (not @samp{\} as in DOS). One
1884
@samp{/} for the directory separator (not @samp{\} as in DOS). One
1885
example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
1885
example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
1886
@file{/boot/grub/menu.lst} in the first partition of the first hard
1886
@file{/boot/grub/grub.conf} in the first partition of the first hard
1887
disk. If you omit the device name in an absolute file name, GRUB uses
1887
disk. If you omit the device name in an absolute file name, GRUB uses
1888
GRUB's @dfn{root device} implicitly. So if you set the root device to,
1888
GRUB's @dfn{root device} implicitly. So if you set the root device to,
1889
say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
1889
say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
Lines 3542-3548 Link Here
3542
3542
3543
@item --config-file=@var{file}
3543
@item --config-file=@var{file}
3544
Read the configuration file @var{file} instead of
3544
Read the configuration file @var{file} instead of
3545
@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
3545
@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
3546
syntax. See @ref{Filesystem}, for more information.
3546
syntax. See @ref{Filesystem}, for more information.
3547
3547
3548
@item --boot-drive=@var{drive}
3548
@item --boot-drive=@var{drive}
(-)grub-0.96.old/docs/Makefile.am (-1 / +1 lines)
Lines 19-25 Link Here
19
boot.o: multiboot.h
19
boot.o: multiboot.h
20
endif
20
endif
21
21
22
EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) \
22
EXTRA_DIST = grub.conf $(man_MANS) $(noinst_SCRIPTS) \
23
	$(EXAMPLES) $(multiboot_TEXINFOS)
23
	$(EXAMPLES) $(multiboot_TEXINFOS)
24
CLEANFILES = $(noinst_PROGRAMS)
24
CLEANFILES = $(noinst_PROGRAMS)
25
25
(-)grub-0.96.old/docs/Makefile.in (-1 / +1 lines)
Lines 211-217 Link Here
211
@BUILD_EXAMPLE_KERNEL_TRUE@	-imacros $(top_builddir)/config.h
211
@BUILD_EXAMPLE_KERNEL_TRUE@	-imacros $(top_builddir)/config.h
212
212
213
@BUILD_EXAMPLE_KERNEL_TRUE@kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000
213
@BUILD_EXAMPLE_KERNEL_TRUE@kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000
214
EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) \
214
EXTRA_DIST = grub.conf $(man_MANS) $(noinst_SCRIPTS) \
215
	$(EXAMPLES) $(multiboot_TEXINFOS)
215
	$(EXAMPLES) $(multiboot_TEXINFOS)
216
216
217
CLEANFILES = $(noinst_PROGRAMS)
217
CLEANFILES = $(noinst_PROGRAMS)
(-)grub-0.96.old/grub/asmstub.c (-1 / +1 lines)
Lines 71-77 Link Here
71
unsigned long boot_drive = 0;
71
unsigned long boot_drive = 0;
72
int saved_entryno = 0;
72
int saved_entryno = 0;
73
char version_string[] = VERSION;
73
char version_string[] = VERSION;
74
char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
74
char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
75
unsigned long linux_text_len = 0;
75
unsigned long linux_text_len = 0;
76
char *linux_data_tmp_addr = 0;
76
char *linux_data_tmp_addr = 0;
77
char *linux_data_real_addr = 0;
77
char *linux_data_real_addr = 0;
(-)grub-0.96.old/stage2/asm.S (-1 / +1 lines)
Lines 98-104 Link Here
98
	.string VERSION
98
	.string VERSION
99
VARIABLE(config_file)
99
VARIABLE(config_file)
100
#ifndef STAGE1_5
100
#ifndef STAGE1_5
101
	.string "/boot/grub/menu.lst"
101
	.string "/boot/grub/grub.conf"
102
#else   /* STAGE1_5 */
102
#else   /* STAGE1_5 */
103
	.long	0xffffffff
103
	.long	0xffffffff
104
	.string "/boot/grub/stage2"
104
	.string "/boot/grub/stage2"
(-)grub-0.96.old/stage2/builtins.c (-1 / +1 lines)
Lines 4093-4099 Link Here
4093
4093
4094
  /* The prefix was determined.  */
4094
  /* The prefix was determined.  */
4095
  grub_sprintf (stage2, "%s%s", prefix, "/stage2");
4095
  grub_sprintf (stage2, "%s%s", prefix, "/stage2");
4096
  grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
4096
  grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
4097
  *real_config_filename = 0;
4097
  *real_config_filename = 0;
4098
4098
4099
  /* Check if stage2 exists.  */
4099
  /* Check if stage2 exists.  */
(-)grub-0.96.old/util/grub-image.in (-1 / +1 lines)
Lines 64-70 Link Here
64
  mkdir -p $bootdir/boot/grub
64
  mkdir -p $bootdir/boot/grub
65
  cp -p $stage1dir/stage1 $stage2dir/*_stage1_5 $stage2dir/stage2 \
65
  cp -p $stage1dir/stage1 $stage2dir/*_stage1_5 $stage2dir/stage2 \
66
    $bootdir/boot/grub
66
    $bootdir/boot/grub
67
  test ! -f menu.lst || cp -p menu.lst $bootdir/boot/grub
67
  test ! -f grub.conf || cp -p grub.conf $bootdir/boot/grub
68
  trap "rm -f $bootdir.tar.gz" 0
68
  trap "rm -f $bootdir.tar.gz" 0
69
  GZIP=-9 tar -zcf $bootdir.tar.gz $bootdir
69
  GZIP=-9 tar -zcf $bootdir.tar.gz $bootdir
70
  trap '' 0
70
  trap '' 0

Return to bug 80693