Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 50316 Details for
Bug 80693
grub-0.96 (version bump)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to modify all menu.lst into grub.conf
grub-0.96-grub.conf.patch (text/plain), 6.92 KB, created by
Peter Volkov (RETIRED)
on 2005-02-04 03:27:18 UTC
(
hide
)
Description:
patch to modify all menu.lst into grub.conf
Filename:
MIME Type:
Creator:
Peter Volkov (RETIRED)
Created:
2005-02-04 03:27:18 UTC
Size:
6.92 KB
patch
obsolete
>diff -ru grub-0.96.old/docs/grub.8 grub-0.96/docs/grub.8 >--- grub-0.96.old/docs/grub.8 2005-01-30 04:08:38.000000000 +0300 >+++ grub-0.96/docs/grub.8 2005-02-04 11:20:46.386150744 +0300 >@@ -15,7 +15,7 @@ > specify stage2 boot_drive [default=0x0] > .TP > \fB\-\-config\-file\fR=\fIFILE\fR >-specify stage2 config_file [default=/boot/grub/menu.lst] >+specify stage2 config_file [default=/boot/grub/grub.conf] > .TP > \fB\-\-device\-map\fR=\fIFILE\fR > use the device map file FILE >diff -ru grub-0.96.old/docs/grub.info grub-0.96/docs/grub.info >--- grub-0.96.old/docs/grub.info 2005-01-30 04:08:38.000000000 +0300 >+++ grub-0.96/docs/grub.info 2005-02-04 11:20:46.390150136 +0300 >@@ -1147,7 +1147,7 @@ > (*note Menu interface::) from which you can select an item (using arrow > keys) that will do everything to boot an OS. > >- To enable the menu, you need a configuration file, `menu.lst' under >+ To enable the menu, you need a configuration file, `grub.conf' under > the boot directory. We'll analyze an example file. > > The file first contains some general settings, the menu interface >@@ -1373,7 +1373,7 @@ > foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\ > :bf=/nbgrub:\ > :tc=.allhost:\ >- :T150="(nd)/tftpboot/menu.lst.foo": >+ :T150="(nd)/tftpboot/grub.conf.foo": > > Note that you should specify the drive name `(nd)' in the name of > the configuration file. This is because you might change the root drive >@@ -1693,7 +1693,7 @@ > > An absolute file name resembles a Unix absolute file name, using `/' > for the directory separator (not `\' as in DOS). One example is >-`(hd0,0)/boot/grub/menu.lst'. This means the file `/boot/grub/menu.lst' >+`(hd0,0)/boot/grub/grub.conf'. This means the file `/boot/grub/grub.conf' > in the first partition of the first hard disk. If you omit the device > name in an absolute file name, GRUB uses GRUB's "root device" > implicitly. So if you set the root device to, say, `(hd1,0)' by the >@@ -3405,7 +3405,7 @@ > grub shell just ignores this option. > > `--config-file=FILE' >- Read the configuration file FILE instead of `/boot/grub/menu.lst'. >+ Read the configuration file FILE instead of `/boot/grub/grub.conf'. > The format is the same as the normal GRUB syntax. See *Note > Filesystem::, for more information. > >diff -ru grub-0.96.old/docs/grub.texi grub-0.96/docs/grub.texi >--- grub-0.96.old/docs/grub.texi 2004-09-21 01:47:38.000000000 +0400 >+++ grub-0.96/docs/grub.texi 2005-02-04 11:20:46.393149680 +0300 >@@ -1265,7 +1265,7 @@ > keys) that will do everything to boot an OS. > > To enable the menu, you need a configuration file, >-@file{menu.lst} under the boot directory. We'll analyze an example >+@file{grub.conf} under the boot directory. We'll analyze an example > file. > > The file first contains some general settings, the menu interface >@@ -1538,7 +1538,7 @@ > foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\ > :bf=/nbgrub:\ > :tc=.allhost:\ >- :T150="(nd)/tftpboot/menu.lst.foo": >+ :T150="(nd)/tftpboot/grub.conf.foo": > @end group > @end example > >@@ -1882,8 +1882,8 @@ > > An absolute file name resembles a Unix absolute file name, using > @samp{/} for the directory separator (not @samp{\} as in DOS). One >-example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file >-@file{/boot/grub/menu.lst} in the first partition of the first hard >+example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file >+@file{/boot/grub/grub.conf} in the first partition of the first hard > disk. If you omit the device name in an absolute file name, GRUB uses > GRUB's @dfn{root device} implicitly. So if you set the root device to, > say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then >@@ -3542,7 +3542,7 @@ > > @item --config-file=@var{file} > Read the configuration file @var{file} instead of >-@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB >+@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB > syntax. See @ref{Filesystem}, for more information. > > @item --boot-drive=@var{drive} >diff -ru grub-0.96.old/docs/Makefile.am grub-0.96/docs/Makefile.am >--- grub-0.96.old/docs/Makefile.am 2003-07-09 15:45:35.000000000 +0400 >+++ grub-0.96/docs/Makefile.am 2005-02-04 11:20:46.384151048 +0300 >@@ -19,7 +19,7 @@ > boot.o: multiboot.h > endif > >-EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) \ >+EXTRA_DIST = grub.conf $(man_MANS) $(noinst_SCRIPTS) \ > $(EXAMPLES) $(multiboot_TEXINFOS) > CLEANFILES = $(noinst_PROGRAMS) > >diff -ru grub-0.96.old/docs/Makefile.in grub-0.96/docs/Makefile.in >--- grub-0.96.old/docs/Makefile.in 2005-01-30 04:07:36.000000000 +0300 >+++ grub-0.96/docs/Makefile.in 2005-02-04 11:23:45.453928304 +0300 >@@ -211,7 +211,7 @@ > @BUILD_EXAMPLE_KERNEL_TRUE@ -imacros $(top_builddir)/config.h > > @BUILD_EXAMPLE_KERNEL_TRUE@kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 >-EXTRA_DIST = menu.lst $(man_MANS) $(noinst_SCRIPTS) \ >+EXTRA_DIST = grub.conf $(man_MANS) $(noinst_SCRIPTS) \ > $(EXAMPLES) $(multiboot_TEXINFOS) > > CLEANFILES = $(noinst_PROGRAMS) >diff -ru grub-0.96.old/grub/asmstub.c grub-0.96/grub/asmstub.c >--- grub-0.96.old/grub/asmstub.c 2004-03-12 20:01:49.000000000 +0300 >+++ grub-0.96/grub/asmstub.c 2005-02-04 11:20:46.394149528 +0300 >@@ -71,7 +71,7 @@ > unsigned long boot_drive = 0; > int saved_entryno = 0; > char version_string[] = VERSION; >-char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */ >+char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */ > unsigned long linux_text_len = 0; > char *linux_data_tmp_addr = 0; > char *linux_data_real_addr = 0; >diff -ru grub-0.96.old/stage2/asm.S grub-0.96/stage2/asm.S >--- grub-0.96.old/stage2/asm.S 2005-02-04 11:04:03.530607000 +0300 >+++ grub-0.96/stage2/asm.S 2005-02-04 11:20:46.396149224 +0300 >@@ -98,7 +98,7 @@ > .string VERSION > VARIABLE(config_file) > #ifndef STAGE1_5 >- .string "/boot/grub/menu.lst" >+ .string "/boot/grub/grub.conf" > #else /* STAGE1_5 */ > .long 0xffffffff > .string "/boot/grub/stage2" >diff -ru grub-0.96.old/stage2/builtins.c grub-0.96/stage2/builtins.c >--- grub-0.96.old/stage2/builtins.c 2005-02-04 11:04:03.534607000 +0300 >+++ grub-0.96/stage2/builtins.c 2005-02-04 11:20:46.398148920 +0300 >@@ -4093,7 +4093,7 @@ > > /* The prefix was determined. */ > grub_sprintf (stage2, "%s%s", prefix, "/stage2"); >- grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst"); >+ grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf"); > *real_config_filename = 0; > > /* Check if stage2 exists. */ >diff -ru grub-0.96.old/util/grub-image.in grub-0.96/util/grub-image.in >--- grub-0.96.old/util/grub-image.in 2004-07-16 15:44:56.000000000 +0400 >+++ grub-0.96/util/grub-image.in 2005-02-04 11:20:46.402148312 +0300 >@@ -64,7 +64,7 @@ > mkdir -p $bootdir/boot/grub > cp -p $stage1dir/stage1 $stage2dir/*_stage1_5 $stage2dir/stage2 \ > $bootdir/boot/grub >- test ! -f menu.lst || cp -p menu.lst $bootdir/boot/grub >+ test ! -f grub.conf || cp -p grub.conf $bootdir/boot/grub > trap "rm -f $bootdir.tar.gz" 0 > GZIP=-9 tar -zcf $bootdir.tar.gz $bootdir > trap '' 0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 80693
:
50315
| 50316 |
50317
|
50318
|
50319
|
51439
|
51440
|
51441
|
51442
|
51443
|
51444
|
51445
|
51446
|
51491
|
51633
|
51634
|
51660
|
52976
|
53009
|
53147
|
53148
|
53157
|
56647