Clean up dangling references to grub-setup.
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
parent
5e3b8dcbb5
commit
01323d49bf
9 changed files with 51 additions and 23 deletions
25
ChangeLog
25
ChangeLog
|
|
@ -1,3 +1,28 @@
|
||||||
|
2013-01-12 Colin Watson <cjwatson@ubuntu.com>
|
||||||
|
|
||||||
|
Clean up dangling references to grub-setup.
|
||||||
|
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.
|
||||||
|
|
||||||
2013-01-11 Vladimir Serbinenko <phcoder@gmail.com>
|
2013-01-11 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Import gcrypt public-key cryptography and implement signature checking.
|
Import gcrypt public-key cryptography and implement signature checking.
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,6 @@ grub_TRANSFORM([grub-probe])
|
||||||
grub_TRANSFORM([grub-reboot])
|
grub_TRANSFORM([grub-reboot])
|
||||||
grub_TRANSFORM([grub-script-check])
|
grub_TRANSFORM([grub-script-check])
|
||||||
grub_TRANSFORM([grub-set-default])
|
grub_TRANSFORM([grub-set-default])
|
||||||
grub_TRANSFORM([grub-setup])
|
|
||||||
grub_TRANSFORM([grub-sparc64-setup])
|
grub_TRANSFORM([grub-sparc64-setup])
|
||||||
|
|
||||||
# Optimization flag. Allow user to override.
|
# Optimization flag. Allow user to override.
|
||||||
|
|
|
||||||
|
|
@ -622,11 +622,11 @@ This install doesn't conflict with standard install as long as they are in
|
||||||
separate directories.
|
separate directories.
|
||||||
|
|
||||||
Note that @command{grub-install} is actually just a shell script and the
|
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}.
|
real task is done by other tools such as @command{grub-mkimage}. Therefore,
|
||||||
Therefore, you may run those commands directly to install GRUB, without
|
you may run those commands directly to install GRUB, without using
|
||||||
using @command{grub-install}. Don't do that, however, unless you are very
|
@command{grub-install}. Don't do that, however, unless you are very familiar
|
||||||
familiar with the internals of GRUB. Installing a boot loader on a running
|
with the internals of GRUB. Installing a boot loader on a running OS may be
|
||||||
OS may be extremely dangerous.
|
extremely dangerous.
|
||||||
|
|
||||||
@node Making a GRUB bootable CD-ROM
|
@node Making a GRUB bootable CD-ROM
|
||||||
@section 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
|
@section The map between BIOS drives and OS devices
|
||||||
|
|
||||||
If the device map file exists, the GRUB utilities (@command{grub-probe},
|
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
|
etc.) read it to map BIOS drives to OS devices. This file consists of lines
|
||||||
file consists of lines like this:
|
like this:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
(@var{device}) @var{file}
|
(@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
|
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,
|
image from a local disk and jump to it. Because of the size restriction,
|
||||||
@file{boot.img} cannot understand any file system structure, so
|
@file{boot.img} cannot understand any file system structure, so
|
||||||
@command{grub-setup} hardcodes the location of the first sector of the core
|
@command{grub-install} hardcodes the location of the first sector of the
|
||||||
image into @file{boot.img} when installing GRUB.
|
core image into @file{boot.img} when installing GRUB.
|
||||||
|
|
||||||
@item diskboot.img
|
@item diskboot.img
|
||||||
This image is used as the first sector of the core image when booting from a
|
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
|
@node Invoking grub-install
|
||||||
@chapter Invoking grub-install
|
@chapter Invoking grub-install
|
||||||
|
|
||||||
The program @command{grub-install} installs GRUB on your drive using
|
The program @command{grub-install} generates a GRUB core image using
|
||||||
@command{grub-mkimage} and (on some platforms) @command{grub-setup}. You
|
@command{grub-mkimage} and installs it on your system. You must specify the
|
||||||
must specify the device name on which you want to install GRUB, like this:
|
device name on which you want to install GRUB, like this:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
grub-install @var{install_device}
|
grub-install @var{install_device}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[NAME]
|
[NAME]
|
||||||
grub-setup \- set up a device to boot using GRUB
|
grub-bios-setup \- set up a device to boot using GRUB
|
||||||
[SEE ALSO]
|
[SEE ALSO]
|
||||||
.BR grub-install (8),
|
.BR grub-install (8),
|
||||||
.BR grub-mkimage (1),
|
.BR grub-mkimage (1),
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,4 @@ grub-install \- install GRUB to a device
|
||||||
[SEE ALSO]
|
[SEE ALSO]
|
||||||
.BR grub-mkconfig (8),
|
.BR grub-mkconfig (8),
|
||||||
.BR grub-mkimage (1),
|
.BR grub-mkimage (1),
|
||||||
.BR grub-setup (8),
|
|
||||||
.BR grub-mkrescue (1)
|
.BR grub-mkrescue (1)
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,5 @@
|
||||||
grub-mkimage \- make a bootable image of GRUB
|
grub-mkimage \- make a bootable image of GRUB
|
||||||
[SEE ALSO]
|
[SEE ALSO]
|
||||||
.BR grub-install (8),
|
.BR grub-install (8),
|
||||||
.BR grub-setup (8),
|
|
||||||
.BR grub-mkrescue (1),
|
.BR grub-mkrescue (1),
|
||||||
.BR grub-mknetdir (8)
|
.BR grub-mknetdir (8)
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[NAME]
|
[NAME]
|
||||||
grub-setup \- set up a device to boot using GRUB
|
grub-sparc64-setup \- set up a device to boot using GRUB
|
||||||
[SEE ALSO]
|
[SEE ALSO]
|
||||||
.BR grub-install (8),
|
.BR grub-install (8),
|
||||||
.BR grub-mkimage (1),
|
.BR grub-mkimage (1),
|
||||||
|
|
|
||||||
|
|
@ -252,10 +252,16 @@ _grub_setup () {
|
||||||
_filedir
|
_filedir
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
__grub_setup_program="@grub_setup@"
|
|
||||||
have ${__grub_setup_program} && \
|
__grub_bios_setup_program="@grub_bios_setup@"
|
||||||
complete -F _grub_setup -o filenames ${__grub_setup_program}
|
have ${__grub_bios_setup_program} && \
|
||||||
unset __grub_setup_program
|
complete -F _grub_setup -o filenames ${__grub_bios_setup_program}
|
||||||
|
unset __grub_bios_setup_program
|
||||||
|
|
||||||
|
__grub_sparc64_setup_program="@grub_sparc64_setup@"
|
||||||
|
have ${__grub_sparc64_setup_program} && \
|
||||||
|
complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
|
||||||
|
unset __grub_sparc64_setup_program
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -114,8 +114,8 @@ echo
|
||||||
gettext "INSTALL_DEVICE must be system device filename.";echo
|
gettext "INSTALL_DEVICE must be system device filename.";echo
|
||||||
echo
|
echo
|
||||||
|
|
||||||
gettext_printf "%s copies GRUB images into %s, and uses grub-setup
|
gettext_printf "%s copies GRUB images into %s. On some platforms, it
|
||||||
to install grub into the boot sector.\n" "$self" "$grubdir";echo
|
may also install GRUB into the boot sector.\n" "$self" "$grubdir";echo
|
||||||
echo
|
echo
|
||||||
gettext "Report bugs to <bug-grub@gnu.org>."; echo
|
gettext "Report bugs to <bug-grub@gnu.org>."; echo
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue