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

Clean up dangling references to grub-setup.

Browse source 
Fixes Ubuntu bug #1082045.

* docs/grub.texi (Images): Refer generally to grub-install rather
than directly to grub-setup.
(Installing GRUB using grub-install): Remove direct reference to
grub-setup.
(Device map) Likewise.
(Invoking grub-install): Likewise.
* docs/man/grub-install.h2m (SEE ALSO): Likewise.
* docs/man/grub-mkimage.h2m (SEE ALSO): Likewise.
* util/grub-install.in (usage): Likewise.

* util/bash-completion.d/grub-completion.bash.in (_grub_setup):
Apply to grub-bios-setup and grub-sparc64-setup rather than to
grub-setup.
* configure.ac: Remove grub_setup output variable.

* docs/man/grub-bios-setup.h2m (NAME): Change name from grub-setup
to grub-bios-setup.
* docs/man/grub-sparc64-setup.h2m (NAME): Change name from
grub-setup to grub-sparc64-setup.
This commit is contained in:
Colin Watson 2013-01-12 13:30:37 +00:00
parent 5e3b8dcbb5
commit 01323d49bf
9 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
docs/grub.texi
View file

@ -622,11 +622,11 @@ This install doesn't conflict with standard install as long as they are in
separate directories.
Note that @command{grub-install} is actually just a shell script and the
real task is done by @command{grub-mkimage} and @command{grub-setup}.
Therefore, you may run those commands directly to install GRUB, without
using @command{grub-install}. Don't do that, however, unless you are very
familiar with the internals of GRUB. Installing a boot loader on a running
OS may be extremely dangerous.
real task is done by other tools such as @command{grub-mkimage}. Therefore,
you may run those commands directly to install GRUB, without using
@command{grub-install}. Don't do that, however, unless you are very familiar
with the internals of GRUB. Installing a boot loader on a running OS may be
extremely dangerous.
@node Making a GRUB bootable CD-ROM
@section Making a GRUB bootable CD-ROM
@ -688,8 +688,8 @@ storage devices.
@section The map between BIOS drives and OS devices
If the device map file exists, the GRUB utilities (@command{grub-probe},
@command{grub-setup}, etc.) read it to map BIOS drives to OS devices. This
file consists of lines like this:
etc.) read it to map BIOS drives to OS devices. This file consists of lines
like this:
@example
(@var{device}) @var{file}
@ -2283,8 +2283,8 @@ bytes.
The sole function of @file{boot.img} is to read the first sector of the core
image from a local disk and jump to it. Because of the size restriction,
@file{boot.img} cannot understand any file system structure, so
@command{grub-setup} hardcodes the location of the first sector of the core
image into @file{boot.img} when installing GRUB.
@command{grub-install} hardcodes the location of the first sector of the
core image into @file{boot.img} when installing GRUB.
@item diskboot.img
This image is used as the first sector of the core image when booting from a
@ -4689,9 +4689,9 @@ GRUB.
@node Invoking grub-install
@chapter Invoking grub-install
The program @command{grub-install} installs GRUB on your drive using
@command{grub-mkimage} and (on some platforms) @command{grub-setup}. You
must specify the device name on which you want to install GRUB, like this:
The program @command{grub-install} generates a GRUB core image using
@command{grub-mkimage} and installs it on your system. You must specify the
device name on which you want to install GRUB, like this:
@example
grub-install @var{install_device}

2
docs/man/grub-bios-setup.h2m
View file

@ -1,5 +1,5 @@
[NAME]
grub-setup \- set up a device to boot using GRUB
grub-bios-setup \- set up a device to boot using GRUB
[SEE ALSO]
.BR grub-install (8),
.BR grub-mkimage (1),

1
docs/man/grub-install.h2m
View file

@ -3,5 +3,4 @@ grub-install \- install GRUB to a device
[SEE ALSO]
.BR grub-mkconfig (8),
.BR grub-mkimage (1),
.BR grub-setup (8),
.BR grub-mkrescue (1)

1
docs/man/grub-mkimage.h2m
View file

@ -2,6 +2,5 @@
grub-mkimage \- make a bootable image of GRUB
[SEE ALSO]
.BR grub-install (8),
.BR grub-setup (8),
.BR grub-mkrescue (1),
.BR grub-mknetdir (8)

2
docs/man/grub-sparc64-setup.h2m
View file

@ -1,5 +1,5 @@
[NAME]
grub-setup \- set up a device to boot using GRUB
grub-sparc64-setup \- set up a device to boot using GRUB
[SEE ALSO]
.BR grub-install (8),
.BR grub-mkimage (1),