Blame SOURCES/0039-Make-our-info-pages-say-grub2-where-appropriate.patch

8e15ce
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8e15ce
From: Peter Jones <pjones@redhat.com>
8e15ce
Date: Tue, 9 Jul 2019 12:59:58 +0200
8e15ce
Subject: [PATCH] Make our info pages say "grub2" where appropriate.
8e15ce
8e15ce
This needs to be hooked up to --program-transform=, but I haven't had
8e15ce
time.
8e15ce
8e15ce
Signed-off-by: Peter Jones <pjones@redhat.com>
8e15ce
---
8e15ce
 docs/grub-dev.texi |   4 +-
8e15ce
 docs/grub.texi     | 321 ++++++++++++++++++++++++++++-------------------------
8e15ce
 2 files changed, 171 insertions(+), 154 deletions(-)
8e15ce
8e15ce
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
b35c50
index 6c629a23e2..19f708ee66 100644
8e15ce
--- a/docs/grub-dev.texi
8e15ce
+++ b/docs/grub-dev.texi
8e15ce
@@ -1,7 +1,7 @@
8e15ce
 \input texinfo
8e15ce
 @c -*-texinfo-*-
8e15ce
 @c %**start of header
8e15ce
-@setfilename grub-dev.info
8e15ce
+@setfilename grub2-dev.info
8e15ce
 @include version-dev.texi
8e15ce
 @settitle GNU GRUB Developers Manual @value{VERSION}
8e15ce
 @c Unify all our little indices for now.
8e15ce
@@ -32,7 +32,7 @@ Invariant Sections.
8e15ce
 
8e15ce
 @dircategory Kernel
8e15ce
 @direntry
8e15ce
-* grub-dev: (grub-dev).                 The GRand Unified Bootloader Dev
8e15ce
+* grub2-dev: (grub2-dev).                 The GRand Unified Bootloader Dev
8e15ce
 @end direntry
8e15ce
 
8e15ce
 @setchapternewpage odd
8e15ce
diff --git a/docs/grub.texi b/docs/grub.texi
b35c50
index 69f08d289f..0615d0ed97 100644
8e15ce
--- a/docs/grub.texi
8e15ce
+++ b/docs/grub.texi
8e15ce
@@ -1,7 +1,7 @@
8e15ce
 \input texinfo
8e15ce
 @c -*-texinfo-*-
8e15ce
 @c %**start of header
8e15ce
-@setfilename grub.info
8e15ce
+@setfilename grub2.info
8e15ce
 @include version.texi
8e15ce
 @settitle GNU GRUB Manual @value{VERSION}
8e15ce
 @c Unify all our little indices for now.
8e15ce
@@ -32,15 +32,15 @@ Invariant Sections.
8e15ce
 
8e15ce
 @dircategory Kernel
8e15ce
 @direntry
8e15ce
-* GRUB: (grub).                 The GRand Unified Bootloader
8e15ce
-* grub-install: (grub)Invoking grub-install.    Install GRUB on your drive
8e15ce
-* grub-mkconfig: (grub)Invoking grub-mkconfig.  Generate GRUB configuration
8e15ce
-* grub-mkpasswd-pbkdf2: (grub)Invoking grub-mkpasswd-pbkdf2.
8e15ce
-* grub-mkrelpath: (grub)Invoking grub-mkrelpath.
8e15ce
-* grub-mkrescue: (grub)Invoking grub-mkrescue.  Make a GRUB rescue image
8e15ce
-* grub-mount: (grub)Invoking grub-mount.        Mount a file system using GRUB
8e15ce
-* grub-probe: (grub)Invoking grub-probe.        Probe device information
8e15ce
-* grub-script-check: (grub)Invoking grub-script-check.
8e15ce
+* GRUB2: (grub2).                 The GRand Unified Bootloader
8e15ce
+* grub2-install: (grub2)Invoking grub2-install.    Install GRUB on your drive
8e15ce
+* grub2-mkconfig: (grub2)Invoking grub2-mkconfig.  Generate GRUB configuration
8e15ce
+* grub2-mkpasswd-pbkdf2: (grub2)Invoking grub2-mkpasswd-pbkdf2.
8e15ce
+* grub2-mkrelpath: (grub2)Invoking grub2-mkrelpath.
8e15ce
+* grub2-mkrescue: (grub2)Invoking grub2-mkrescue.  Make a GRUB rescue image
8e15ce
+* grub2-mount: (grub2)Invoking grub2-mount.        Mount a file system using GRUB
8e15ce
+* grub2-probe: (grub2)Invoking grub2-probe.        Probe device information
8e15ce
+* grub2-script-check: (grub2)Invoking grub2-script-check.
8e15ce
 @end direntry
8e15ce
 
8e15ce
 @setchapternewpage odd
8e15ce
@@ -103,15 +103,15 @@ This edition documents version @value{VERSION}.
8e15ce
 * Platform-specific operations:: Platform-specific operations
8e15ce
 * Supported kernels::           The list of supported kernels
8e15ce
 * Troubleshooting::             Error messages produced by GRUB
8e15ce
-* Invoking grub-install::       How to use the GRUB installer
8e15ce
-* Invoking grub-mkconfig::      Generate a GRUB configuration file
8e15ce
-* Invoking grub-mkpasswd-pbkdf2::
8e15ce
+* Invoking grub2-install::       How to use the GRUB installer
8e15ce
+* Invoking grub2-mkconfig::      Generate a GRUB configuration file
8e15ce
+* Invoking grub2-mkpasswd-pbkdf2::
8e15ce
                                 Generate GRUB password hashes
8e15ce
-* Invoking grub-mkrelpath::     Make system path relative to its root
8e15ce
-* Invoking grub-mkrescue::      Make a GRUB rescue image
8e15ce
-* Invoking grub-mount::         Mount a file system using GRUB
8e15ce
-* Invoking grub-probe::         Probe device information for GRUB
8e15ce
-* Invoking grub-script-check::  Check GRUB script file for syntax errors
8e15ce
+* Invoking grub2-mkrelpath::     Make system path relative to its root
8e15ce
+* Invoking grub2-mkrescue::      Make a GRUB rescue image
8e15ce
+* Invoking grub2-mount::         Mount a file system using GRUB
8e15ce
+* Invoking grub2-probe::         Probe device information for GRUB
8e15ce
+* Invoking grub2-script-check::  Check GRUB script file for syntax errors
8e15ce
 * Obtaining and Building GRUB:: How to obtain and build GRUB
8e15ce
 * Reporting bugs::              Where you should send a bug report
8e15ce
 * Future::                      Some future plans on GRUB
8e15ce
@@ -230,7 +230,7 @@ surprising.
8e15ce
 
8e15ce
 @item
8e15ce
 @file{grub.cfg} is typically automatically generated by
8e15ce
-@command{grub-mkconfig} (@pxref{Simple configuration}).  This makes it
8e15ce
+@command{grub2-mkconfig} (@pxref{Simple configuration}).  This makes it
8e15ce
 easier to handle versioned kernel upgrades.
8e15ce
 
8e15ce
 @item
8e15ce
@@ -244,7 +244,7 @@ scripting language: variables, conditionals, and loops are available.
8e15ce
 @item
8e15ce
 A small amount of persistent storage is available across reboots, using the
8e15ce
 @command{save_env} and @command{load_env} commands in GRUB and the
8e15ce
-@command{grub-editenv} utility.  This is not available in all configurations
8e15ce
+@command{grub2-editenv} utility.  This is not available in all configurations
8e15ce
 (@pxref{Environment block}).
8e15ce
 
8e15ce
 @item
8e15ce
@@ -549,7 +549,7 @@ On OS which have device nodes similar to Unix-like OS GRUB tools use the
8e15ce
 OS name. E.g. for GNU/Linux:
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install /dev/sda}
8e15ce
+# @kbd{grub2-install /dev/sda}
8e15ce
 @end example
8e15ce
 
8e15ce
 On AROS we use another syntax. For volumes:
8e15ce
@@ -572,7 +572,7 @@ For disks we use syntax:
8e15ce
 E.g.
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install //:ata.device/0/0}
8e15ce
+# @kbd{grub2-install //:ata.device/0/0}
8e15ce
 @end example
8e15ce
 
8e15ce
 On Windows we use UNC path. For volumes it's typically
8e15ce
@@ -599,7 +599,7 @@ For disks it's
8e15ce
 E.g.
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install \\?\PhysicalDrive0}
8e15ce
+# @kbd{grub2-install \\?\PhysicalDrive0}
8e15ce
 @end example
8e15ce
 
8e15ce
 Beware that you may need to further escape the backslashes depending on your
8e15ce
@@ -609,7 +609,7 @@ When compiled with cygwin support then cygwin drive names are automatically
8e15ce
 when needed. E.g.
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install /dev/sda}
8e15ce
+# @kbd{grub2-install /dev/sda}
8e15ce
 @end example
8e15ce
 
8e15ce
 @node Installation
8e15ce
@@ -622,7 +622,7 @@ from the source tarball, or as a package for your OS.
8e15ce
 
8e15ce
 After you have done that, you need to install the boot loader on a
8e15ce
 drive (floppy or hard disk) by using the utility
8e15ce
-@command{grub-install} (@pxref{Invoking grub-install}) on a UNIX-like OS.
8e15ce
+@command{grub2-install} (@pxref{Invoking grub2-install}) on a UNIX-like OS.
8e15ce
 
8e15ce
 GRUB comes with boot images, which are normally put in the directory
8e15ce
 @file{/usr/lib/grub/<cpu>-<platform>} (for BIOS-based machines
8e15ce
@@ -633,22 +633,22 @@ loader needs to find them (usually @file{/boot}) will be called
8e15ce
 the @dfn{boot directory}.
8e15ce
 
8e15ce
 @menu
8e15ce
-* Installing GRUB using grub-install::
8e15ce
+* Installing GRUB using grub2-install::
8e15ce
 * Making a GRUB bootable CD-ROM::
8e15ce
 * Device map::
8e15ce
 * BIOS installation::
8e15ce
 @end menu
8e15ce
 
8e15ce
 
8e15ce
-@node Installing GRUB using grub-install
8e15ce
-@section Installing GRUB using grub-install
8e15ce
+@node Installing GRUB using grub2-install
8e15ce
+@section Installing GRUB using grub2-install
8e15ce
 
8e15ce
 For information on where GRUB should be installed on PC BIOS platforms,
8e15ce
 @pxref{BIOS installation}.
8e15ce
 
8e15ce
 In order to install GRUB under a UNIX-like OS (such
8e15ce
-as @sc{gnu}), invoke the program @command{grub-install} (@pxref{Invoking
8e15ce
-grub-install}) as the superuser (@dfn{root}).
8e15ce
+as @sc{gnu}), invoke the program @command{grub2-install} (@pxref{Invoking
8e15ce
+grub2-install}) as the superuser (@dfn{root}).
8e15ce
 
8e15ce
 The usage is basically very simple. You only need to specify one
8e15ce
 argument to the program, namely, where to install the boot loader. The
8e15ce
@@ -657,13 +657,13 @@ For example, under Linux the following will install GRUB into the MBR
8e15ce
 of the first IDE disk:
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install /dev/sda}
8e15ce
+# @kbd{grub2-install /dev/sda}
8e15ce
 @end example
8e15ce
 
8e15ce
 Likewise, under GNU/Hurd, this has the same effect:
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install /dev/hd0}
8e15ce
+# @kbd{grub2-install /dev/hd0}
8e15ce
 @end example
8e15ce
 
8e15ce
 But all the above examples assume that GRUB should put images under
8e15ce
@@ -677,7 +677,7 @@ boot floppy with a filesystem. Here is an example:
8e15ce
 # @kbd{mke2fs /dev/fd0}
8e15ce
 # @kbd{mount -t ext2 /dev/fd0 /mnt}
8e15ce
 # @kbd{mkdir /mnt/boot}
8e15ce
-# @kbd{grub-install --boot-directory=/mnt/boot /dev/fd0}
8e15ce
+# @kbd{grub2-install --boot-directory=/mnt/boot /dev/fd0}
8e15ce
 # @kbd{umount /mnt}
8e15ce
 @end group
8e15ce
 @end example
8e15ce
@@ -689,30 +689,37 @@ floppy instead of exposing the USB drive as a hard disk (they call it
8e15ce
 @example
8e15ce
 # @kbd{losetup /dev/loop0 /dev/sdb1}
8e15ce
 # @kbd{mount /dev/loop0 /mnt/usb}
8e15ce
-# @kbd{grub-install --boot-directory=/mnt/usb/bugbios --force --allow-floppy /dev/loop0}
8e15ce
+# @kbd{grub2-install --boot-directory=/mnt/usb/bugbios --force --allow-floppy /dev/loop0}
8e15ce
 @end example
8e15ce
 
8e15ce
 This install doesn't conflict with standard install as long as they are in
8e15ce
 separate directories.
8e15ce
 
8e15ce
+Note that @command{grub2-install} is actually just a shell script and the
8e15ce
+real task is done by other tools such as @command{grub2-mkimage}. Therefore,
8e15ce
+you may run those commands directly to install GRUB, without using
8e15ce
+@command{grub2-install}. Don't do that, however, unless you are very familiar
8e15ce
+with the internals of GRUB. Installing a boot loader on a running OS may be
8e15ce
+extremely dangerous.
8e15ce
+
8e15ce
 On EFI systems for fixed disk install you have to mount EFI System Partition.
8e15ce
 If you mount it at @file{/boot/efi} then you don't need any special arguments:
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install}
8e15ce
+# @kbd{grub2-install}
8e15ce
 @end example
8e15ce
 
8e15ce
 Otherwise you need to specify where your EFI System partition is mounted:
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install --efi-directory=/mnt/efi}
8e15ce
+# @kbd{grub2-install --efi-directory=/mnt/efi}
8e15ce
 @end example
8e15ce
 
8e15ce
 For removable installs you have to use @option{--removable} and specify both
8e15ce
 @option{--boot-directory} and @option{--efi-directory}:
8e15ce
 
8e15ce
 @example
8e15ce
-# @kbd{grub-install --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --removable}
8e15ce
+# @kbd{grub2-install --efi-directory=/mnt/usb --boot-directory=/mnt/usb/boot --removable}
8e15ce
 @end example
8e15ce
 
8e15ce
 @node Making a GRUB bootable CD-ROM
8e15ce
@@ -732,10 +739,10 @@ usually also need to include a configuration file @file{grub.cfg} and some
8e15ce
 other GRUB modules.
8e15ce
 
8e15ce
 To make a simple generic GRUB rescue CD, you can use the
8e15ce
-@command{grub-mkrescue} program (@pxref{Invoking grub-mkrescue}):
8e15ce
+@command{grub2-mkrescue} program (@pxref{Invoking grub2-mkrescue}):
8e15ce
 
8e15ce
 @example
8e15ce
-$ @kbd{grub-mkrescue -o grub.iso}
8e15ce
+$ @kbd{grub2-mkrescue -o grub.iso}
8e15ce
 @end example
8e15ce
 
8e15ce
 You will often need to include other files in your image. To do this, first
8e15ce
@@ -758,7 +765,7 @@ directory @file{iso/}.
8e15ce
 Finally, make the image:
8e15ce
 
8e15ce
 @example
8e15ce
-$ @kbd{grub-mkrescue -o grub.iso iso}
8e15ce
+$ @kbd{grub2-mkrescue -o grub.iso iso}
8e15ce
 @end example
8e15ce
 
8e15ce
 This produces a file named @file{grub.iso}, which then can be burned
8e15ce
@@ -774,7 +781,7 @@ storage devices.
8e15ce
 @node Device map
8e15ce
 @section The map between BIOS drives and OS devices
8e15ce
 
8e15ce
-If the device map file exists, the GRUB utilities (@command{grub-probe},
8e15ce
+If the device map file exists, the GRUB utilities (@command{grub2-probe},
8e15ce
 etc.) read it to map BIOS drives to OS devices.  This file consists of lines
8e15ce
 like this:
8e15ce
 
8e15ce
@@ -1254,23 +1261,23 @@ need to write the whole thing by hand.
8e15ce
 @node Simple configuration
8e15ce
 @section Simple configuration handling
8e15ce
 
8e15ce
-The program @command{grub-mkconfig} (@pxref{Invoking grub-mkconfig})
8e15ce
+The program @command{grub2-mkconfig} (@pxref{Invoking grub2-mkconfig})
8e15ce
 generates @file{grub.cfg} files suitable for most cases.  It is suitable for
8e15ce
 use when upgrading a distribution, and will discover available kernels and
8e15ce
 attempt to generate menu entries for them.
8e15ce
 
8e15ce
-@command{grub-mkconfig} does have some limitations.  While adding extra
8e15ce
+@command{grub2-mkconfig} does have some limitations.  While adding extra
8e15ce
 custom menu entries to the end of the list can be done by editing
8e15ce
-@file{/etc/grub.d/40_custom} or creating @file{/boot/grub/custom.cfg},
8e15ce
+@file{/etc/grub.d/40_custom} or creating @file{/boot/grub2/custom.cfg},
8e15ce
 changing the order of menu entries or changing their titles may require
8e15ce
 making complex changes to shell scripts stored in @file{/etc/grub.d/}.  This
8e15ce
 may be improved in the future.  In the meantime, those who feel that it
8e15ce
 would be easier to write @file{grub.cfg} directly are encouraged to do so
8e15ce
 (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system
8e15ce
-provided by their distribution to automatically run @command{grub-mkconfig}.
8e15ce
+provided by their distribution to automatically run @command{grub2-mkconfig}.
8e15ce
 
8e15ce
 The file @file{/etc/default/grub} controls the operation of
8e15ce
-@command{grub-mkconfig}.  It is sourced by a shell script, and so must be
8e15ce
+@command{grub2-mkconfig}.  It is sourced by a shell script, and so must be
8e15ce
 valid POSIX shell input; normally, it will just be a sequence of
8e15ce
 @samp{KEY=value} lines, but if the value contains spaces or other special
8e15ce
 characters then it must be quoted.  For example:
8e15ce
@@ -1308,7 +1315,7 @@ works it's not recommended since titles often contain unstable device names
8e15ce
 and may be translated
8e15ce
 
8e15ce
 If you set this to @samp{saved}, then the default menu entry will be that
8e15ce
-saved by @samp{GRUB_SAVEDEFAULT} or @command{grub-set-default}.  This relies on
8e15ce
+saved by @samp{GRUB_SAVEDEFAULT} or @command{grub2-set-default}.  This relies on
8e15ce
 the environment block, which may not be available in all situations
8e15ce
 (@pxref{Environment block}).
8e15ce
 
8e15ce
@@ -1319,7 +1326,7 @@ If this option is set to @samp{true}, then, when an entry is selected, save
8e15ce
 it as a new default entry for use by future runs of GRUB.  This is only
8e15ce
 useful if @samp{GRUB_DEFAULT=saved}; it is a separate option because
8e15ce
 @samp{GRUB_DEFAULT=saved} is useful without this option, in conjunction with
8e15ce
-@command{grub-set-default}.  Unset by default.
8e15ce
+@command{grub2-set-default}.  Unset by default.
8e15ce
 This option relies on the environment block, which may not be available in
8e15ce
 all situations (@pxref{Environment block}).
8e15ce
 
8e15ce
@@ -1449,7 +1456,7 @@ intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode
8e15ce
 @end example
8e15ce
 
8e15ce
 @item GRUB_DISABLE_LINUX_UUID
8e15ce
-Normally, @command{grub-mkconfig} will generate menu entries that use
8e15ce
+Normally, @command{grub2-mkconfig} will generate menu entries that use
8e15ce
 universally-unique identifiers (UUIDs) to identify the root filesystem to
8e15ce
 the Linux kernel, using a @samp{root=UUID=...} kernel parameter.  This is
8e15ce
 usually more reliable, but in some cases it may not be appropriate.  To
8e15ce
@@ -1471,7 +1478,7 @@ If this option is set to @samp{true}, disable the generation of recovery
8e15ce
 mode menu entries.
8e15ce
 
8e15ce
 @item GRUB_DISABLE_UUID
8e15ce
-Normally, @command{grub-mkconfig} will generate menu entries that use
8e15ce
+Normally, @command{grub2-mkconfig} will generate menu entries that use
8e15ce
 universally-unique identifiers (UUIDs) to identify various filesystems to
8e15ce
 search for files.  This is usually more reliable, but in some cases it may
8e15ce
 not be appropriate.  To disable this use of UUIDs, set this option to
8e15ce
@@ -1482,12 +1489,12 @@ not be appropriate.  To disable this use of UUIDs, set this option to
8e15ce
 @item GRUB_VIDEO_BACKEND
8e15ce
 If graphical video support is required, either because the @samp{gfxterm}
8e15ce
 graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
8e15ce
-then @command{grub-mkconfig} will normally load all available GRUB video
8e15ce
+then @command{grub2-mkconfig} will normally load all available GRUB video
8e15ce
 drivers and use the one most appropriate for your hardware.  If you need to
8e15ce
 override this for some reason, then you can set this option.
8e15ce
 
8e15ce
-After @command{grub-install} has been run, the available video drivers are
8e15ce
-listed in @file{/boot/grub/video.lst}.
8e15ce
+After @command{grub2-install} has been run, the available video drivers are
8e15ce
+listed in @file{/boot/grub2/video.lst}.
8e15ce
 
8e15ce
 @item GRUB_GFXMODE
8e15ce
 Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
8e15ce
@@ -1519,7 +1526,7 @@ boot sequence.  If you have problems, set this option to @samp{text} and
8e15ce
 GRUB will tell Linux to boot in normal text mode.
8e15ce
 
8e15ce
 @item GRUB_DISABLE_OS_PROBER
8e15ce
-Normally, @command{grub-mkconfig} will try to use the external
8e15ce
+Normally, @command{grub2-mkconfig} will try to use the external
8e15ce
 @command{os-prober} program, if installed, to discover other operating
8e15ce
 systems installed on the same system and generate appropriate menu entries
8e15ce
 for them.  Set this option to @samp{true} to disable this.
8e15ce
@@ -1529,7 +1536,7 @@ List of space-separated FS UUIDs of filesystems to be ignored from os-prober
8e15ce
 output. For efi chainloaders it's <UUID>@@<EFI FILE>
8e15ce
 
8e15ce
 @item GRUB_DISABLE_SUBMENU
8e15ce
-Normally, @command{grub-mkconfig} will generate top level menu entry for
8e15ce
+Normally, @command{grub2-mkconfig} will generate top level menu entry for
8e15ce
 the kernel with highest version number and put all other found kernels
8e15ce
 or alternative menu entries for recovery mode in submenu. For entries returned
8e15ce
 by @command{os-prober} first entry will be put on top level and all others
8e15ce
@@ -1537,11 +1544,11 @@ in submenu. If this option is set to @samp{true}, flat menu with all entries
8e15ce
 on top level will be generated instead. Changing this option will require
8e15ce
 changing existing values of @samp{GRUB_DEFAULT}, @samp{fallback} (@pxref{fallback})
8e15ce
 and @samp{default} (@pxref{default}) environment variables as well as saved
8e15ce
-default entry using @command{grub-set-default} and value used with
8e15ce
-@command{grub-reboot}.
8e15ce
+default entry using @command{grub2-set-default} and value used with
8e15ce
+@command{grub2-reboot}.
8e15ce
 
8e15ce
 @item GRUB_ENABLE_CRYPTODISK
8e15ce
-If set to @samp{y}, @command{grub-mkconfig} and @command{grub-install} will
8e15ce
+If set to @samp{y}, @command{grub2-mkconfig} and @command{grub2-install} will
8e15ce
 check for encrypted disks and generate additional commands needed to access
8e15ce
 them during boot.  Note that in this case unattended boot is not possible
8e15ce
 because GRUB will wait for passphrase to unlock encrypted container.
8e15ce
@@ -1600,7 +1607,7 @@ confusing @samp{GRUB_TIMEOUT_STYLE=countdown} or
8e15ce
 
8e15ce
 @end table
8e15ce
 
8e15ce
-For more detailed customisation of @command{grub-mkconfig}'s output, you may
8e15ce
+For more detailed customisation of @command{grub2-mkconfig}'s output, you may
8e15ce
 edit the scripts in @file{/etc/grub.d} directly.
8e15ce
 @file{/etc/grub.d/40_custom} is particularly useful for adding entire custom
8e15ce
 menu entries; simply type the menu entries you want to add at the end of
8e15ce
@@ -1862,7 +1869,7 @@ images as well.
8e15ce
 Mount this partition on/mnt/boot and disable GRUB in all OSes and manually
8e15ce
 install self-compiled latest GRUB with:
8e15ce
 
8e15ce
-@code{grub-install --boot-directory=/mnt/boot /dev/sda}
8e15ce
+@code{grub2-install --boot-directory=/mnt/boot /dev/sda}
8e15ce
 
8e15ce
 In all the OSes install GRUB tools but disable installing GRUB in bootsector,
8e15ce
 so you'll have menu.lst and grub.cfg available for use. Also disable os-prober
8e15ce
@@ -1872,20 +1879,20 @@ use by setting:
8e15ce
 
8e15ce
 in /etc/default/grub
8e15ce
 
8e15ce
-Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
8e15ce
+Then write a grub.cfg (/mnt/boot/grub2/grub.cfg):
8e15ce
 
8e15ce
 @example
8e15ce
 
8e15ce
 menuentry "OS using grub2" @{
8e15ce
    insmod xfs
8e15ce
    search --set=root --label OS1 --hint hd0,msdos8
8e15ce
-   configfile /boot/grub/grub.cfg
8e15ce
+   configfile /boot/grub2/grub.cfg
8e15ce
 @}
8e15ce
 
8e15ce
 menuentry "OS using grub2-legacy" @{
8e15ce
    insmod ext2
8e15ce
    search --set=root --label OS2 --hint hd0,msdos6
8e15ce
-   legacy_configfile /boot/grub/menu.lst
8e15ce
+   legacy_configfile /boot/grub2/menu.lst
8e15ce
 @}
8e15ce
 
8e15ce
 menuentry "Windows XP" @{
8e15ce
@@ -1948,15 +1955,15 @@ GRUB supports embedding a configuration file directly into the core image,
8e15ce
 so that it is loaded before entering normal mode.  This is useful, for
8e15ce
 example, when it is not straightforward to find the real configuration file,
8e15ce
 or when you need to debug problems with loading that file.
8e15ce
-@command{grub-install} uses this feature when it is not using BIOS disk
8e15ce
+@command{grub2-install} uses this feature when it is not using BIOS disk
8e15ce
 functions or when installing to a different disk from the one containing
8e15ce
 @file{/boot/grub}, in which case it needs to use the @command{search}
8e15ce
 command (@pxref{search}) to find @file{/boot/grub}.
8e15ce
 
8e15ce
 To embed a configuration file, use the @option{-c} option to
8e15ce
-@command{grub-mkimage}.  The file is copied into the core image, so it may
8e15ce
+@command{grub2-mkimage}.  The file is copied into the core image, so it may
8e15ce
 reside anywhere on the file system, and may be removed after running
8e15ce
-@command{grub-mkimage}.
8e15ce
+@command{grub2-mkimage}.
8e15ce
 
8e15ce
 After the embedded configuration file (if any) is executed, GRUB will load
8e15ce
 the @samp{normal} module (@pxref{normal}), which will then read the real
8e15ce
@@ -1991,13 +1998,13 @@ included in the core image:
8e15ce
 @example
8e15ce
 @group
8e15ce
 search.fs_label grub root
8e15ce
-if [ -e /boot/grub/example/test1.cfg ]; then
8e15ce
+if [ -e /boot/grub2/example/test1.cfg ]; then
8e15ce
     set prefix=($root)/boot/grub
8e15ce
-    configfile /boot/grub/example/test1.cfg
8e15ce
+    configfile /boot/grub2/example/test1.cfg
8e15ce
 else
8e15ce
-    if [ -e /boot/grub/example/test2.cfg ]; then
8e15ce
+    if [ -e /boot/grub2/example/test2.cfg ]; then
8e15ce
         set prefix=($root)/boot/grub
8e15ce
-        configfile /boot/grub/example/test2.cfg
8e15ce
+        configfile /boot/grub2/example/test2.cfg
8e15ce
     else
8e15ce
         echo "Could not find an example configuration file!"
8e15ce
     fi
8e15ce
@@ -2521,7 +2528,7 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
8e15ce
 @end group
8e15ce
 @end example
8e15ce
 
8e15ce
-Then follow instructions printed out by grub-mknetdir on configuring your DHCP
8e15ce
+Then follow instructions printed out by grub2-mknetdir on configuring your DHCP
8e15ce
 server.
8e15ce
 
8e15ce
 The grub.cfg file is placed in the same directory as the path output by
8e15ce
@@ -2715,7 +2722,7 @@ team are:
8e15ce
 @end table
8e15ce
 
8e15ce
 To take full advantage of this function, install GRUB into the MBR
8e15ce
-(@pxref{Installing GRUB using grub-install}).
8e15ce
+(@pxref{Installing GRUB using grub2-install}).
8e15ce
 
8e15ce
 If you have a laptop which has a similar feature and not in the above list
8e15ce
 could you figure your address and contribute?
8e15ce
@@ -2776,7 +2783,7 @@ bytes.
8e15ce
 The sole function of @file{boot.img} is to read the first sector of the core
8e15ce
 image from a local disk and jump to it.  Because of the size restriction,
8e15ce
 @file{boot.img} cannot understand any file system structure, so
8e15ce
-@command{grub-install} hardcodes the location of the first sector of the
8e15ce
+@command{grub2-install} hardcodes the location of the first sector of the
8e15ce
 core image into @file{boot.img} when installing GRUB.
8e15ce
 
8e15ce
 @item diskboot.img
8e15ce
@@ -2806,7 +2813,7 @@ images.
8e15ce
 
8e15ce
 @item core.img
8e15ce
 This is the core image of GRUB.  It is built dynamically from the kernel
8e15ce
-image and an arbitrary list of modules by the @command{grub-mkimage}
8e15ce
+image and an arbitrary list of modules by the @command{grub2-mkimage}
8e15ce
 program.  Usually, it contains enough modules to access @file{/boot/grub},
8e15ce
 and loads everything else (including menu handling, the ability to load
8e15ce
 target operating systems, and so on) from the file system at run-time.  The
8e15ce
@@ -2858,7 +2865,7 @@ GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
8e15ce
 In GRUB 2, images for booting from CD-ROM drives are now constructed using
8e15ce
 @file{cdboot.img} and @file{core.img}, making sure that the core image
8e15ce
 contains the @samp{iso9660} module.  It is usually best to use the
8e15ce
-@command{grub-mkrescue} program for this.
8e15ce
+@command{grub2-mkrescue} program for this.
8e15ce
 
8e15ce
 @item nbgrub
8e15ce
 There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
8e15ce
@@ -3014,8 +3021,8 @@ There are two ways to specify files, by @dfn{absolute file name} and by
8e15ce
 
8e15ce
 An absolute file name resembles a Unix absolute file name, using
8e15ce
 @samp{/} for the directory separator (not @samp{\} as in DOS). One
8e15ce
-example is @samp{(hd0,1)/boot/grub/grub.cfg}. This means the file
8e15ce
-@file{/boot/grub/grub.cfg} in the first partition of the first hard
8e15ce
+example is @samp{(hd0,1)/boot/grub2/grub.cfg}. This means the file
8e15ce
+@file{/boot/grub2/grub.cfg} in the first partition of the first hard
8e15ce
 disk. If you omit the device name in an absolute file name, GRUB uses
8e15ce
 GRUB's @dfn{root device} implicitly. So if you set the root device to,
8e15ce
 say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
8e15ce
@@ -3023,8 +3030,8 @@ then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
8e15ce
 
8e15ce
 On ZFS filesystem the first path component must be
8e15ce
 @var{volume}@samp{@@}[@var{snapshot}].
8e15ce
-So @samp{/rootvol@@snap-129/boot/grub/grub.cfg} refers to file
8e15ce
-@samp{/boot/grub/grub.cfg} in snapshot of volume @samp{rootvol} with name
8e15ce
+So @samp{/rootvol@@snap-129/boot/grub2/grub.cfg} refers to file
8e15ce
+@samp{/boot/grub2/grub.cfg} in snapshot of volume @samp{rootvol} with name
8e15ce
 @samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
8e15ce
 snapshot name is omitted.
8e15ce
 
8e15ce
@@ -3427,7 +3434,7 @@ The more recent release of Minix would then be identified as
8e15ce
 @samp{other>minix>minix-3.4.0}.
8e15ce
 
8e15ce
 This variable is often set by @samp{GRUB_DEFAULT} (@pxref{Simple
8e15ce
-configuration}), @command{grub-set-default}, or @command{grub-reboot}.
8e15ce
+configuration}), @command{grub2-set-default}, or @command{grub2-reboot}.
8e15ce
 
8e15ce
 
8e15ce
 @node fallback
8e15ce
@@ -3517,7 +3524,7 @@ If this variable is set, it names the language code that the
8e15ce
 example, French would be named as @samp{fr}, and Simplified Chinese as
8e15ce
 @samp{zh_CN}.
8e15ce
 
8e15ce
-@command{grub-mkconfig} (@pxref{Simple configuration}) will try to set a
8e15ce
+@command{grub2-mkconfig} (@pxref{Simple configuration}) will try to set a
8e15ce
 reasonable default for this variable based on the system locale.
8e15ce
 
8e15ce
 
8e15ce
@@ -3525,10 +3532,10 @@ reasonable default for this variable based on the system locale.
8e15ce
 @subsection locale_dir
8e15ce
 
8e15ce
 If this variable is set, it names the directory where translation files may
8e15ce
-be found (@pxref{gettext}), usually @file{/boot/grub/locale}.  Otherwise,
8e15ce
+be found (@pxref{gettext}), usually @file{/boot/grub2/locale}.  Otherwise,
8e15ce
 internationalization is disabled.
8e15ce
 
8e15ce
-@command{grub-mkconfig} (@pxref{Simple configuration}) will set a reasonable
8e15ce
+@command{grub2-mkconfig} (@pxref{Simple configuration}) will set a reasonable
8e15ce
 default for this variable if internationalization is needed and any
8e15ce
 translation files are available.
8e15ce
 
8e15ce
@@ -3646,7 +3653,7 @@ input.  The default is not to pause output.
8e15ce
 
8e15ce
 The location of the @samp{/boot/grub} directory as an absolute file name
8e15ce
 (@pxref{File name syntax}).  This is normally set by GRUB at startup based
8e15ce
-on information provided by @command{grub-install}.  GRUB modules are
8e15ce
+on information provided by @command{grub2-install}.  GRUB modules are
8e15ce
 dynamically loaded from this directory, so it must be set correctly in order
8e15ce
 for many parts of GRUB to work.
8e15ce
 
8e15ce
@@ -3737,17 +3744,17 @@ GRUB provides an ``environment block'' which can be used to save a small
8e15ce
 amount of state.
8e15ce
 
8e15ce
 The environment block is a preallocated 1024-byte file, which normally lives
8e15ce
-in @file{/boot/grub/grubenv} (although you should not assume this).  At boot
8e15ce
+in @file{/boot/grub2/grubenv} (although you should not assume this).  At boot
8e15ce
 time, the @command{load_env} command (@pxref{load_env}) loads environment
8e15ce
 variables from it, and the @command{save_env} (@pxref{save_env}) command
8e15ce
 saves environment variables to it.  From a running system, the
8e15ce
-@command{grub-editenv} utility can be used to edit the environment block.
8e15ce
+@command{grub2-editenv} utility can be used to edit the environment block.
8e15ce
 
8e15ce
 For safety reasons, this storage is only available when installed on a plain
8e15ce
 disk (no LVM or RAID), using a non-checksumming filesystem (no ZFS), and
8e15ce
 using BIOS or EFI functions (no ATA, USB or IEEE1275).
8e15ce
 
8e15ce
-@command{grub-mkconfig} uses this facility to implement
8e15ce
+@command{grub2-mkconfig} uses this facility to implement
8e15ce
 @samp{GRUB_SAVEDEFAULT} (@pxref{Simple configuration}).
8e15ce
 
8e15ce
 
8e15ce
@@ -4476,7 +4483,7 @@ Translate @var{string} into the current language.
8e15ce
 
8e15ce
 The current language code is stored in the @samp{lang} variable in GRUB's
8e15ce
 environment (@pxref{lang}).  Translation files in MO format are read from
8e15ce
-@samp{locale_dir} (@pxref{locale_dir}), usually @file{/boot/grub/locale}.
8e15ce
+@samp{locale_dir} (@pxref{locale_dir}), usually @file{/boot/grub2/locale}.
8e15ce
 @end deffn
8e15ce
 
8e15ce
 
8e15ce
@@ -4871,7 +4878,7 @@ Define a user named @var{user} with password @var{clear-password}.
8e15ce
 
8e15ce
 @deffn Command password_pbkdf2 user hashed-password
8e15ce
 Define a user named @var{user} with password hash @var{hashed-password}.
8e15ce
-Use @command{grub-mkpasswd-pbkdf2} (@pxref{Invoking grub-mkpasswd-pbkdf2})
8e15ce
+Use @command{grub2-mkpasswd-pbkdf2} (@pxref{Invoking grub2-mkpasswd-pbkdf2})
8e15ce
 to generate password hashes.  @xref{Security}.
8e15ce
 @end deffn
8e15ce
 
8e15ce
@@ -5814,8 +5821,8 @@ The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
8e15ce
 which has an associated password.  @samp{password} sets the password in
8e15ce
 plain text, requiring @file{grub.cfg} to be secure; @samp{password_pbkdf2}
8e15ce
 sets the password hashed using the Password-Based Key Derivation Function
8e15ce
-(RFC 2898), requiring the use of @command{grub-mkpasswd-pbkdf2}
8e15ce
-(@pxref{Invoking grub-mkpasswd-pbkdf2}) to generate password hashes.
8e15ce
+(RFC 2898), requiring the use of @command{grub2-mkpasswd-pbkdf2}
8e15ce
+(@pxref{Invoking grub2-mkpasswd-pbkdf2}) to generate password hashes.
8e15ce
 
8e15ce
 In order to enable authentication support, the @samp{superusers} environment
8e15ce
 variable must be set to a list of usernames, separated by any of spaces,
8e15ce
@@ -5860,7 +5867,7 @@ menuentry "May be run by user1 or a superuser" --users user1 @{
8e15ce
 @end group
8e15ce
 @end example
8e15ce
 
8e15ce
-The @command{grub-mkconfig} program does not yet have built-in support for
8e15ce
+The @command{grub2-mkconfig} program does not yet have built-in support for
8e15ce
 generating configuration files with authentication.  You can use
8e15ce
 @file{/etc/grub.d/40_custom} to add simple superuser authentication, by
8e15ce
 adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
8e15ce
@@ -5887,7 +5894,17 @@ may halt or otherwise impact the boot process.
8e15ce
 
8e15ce
 An initial trusted public key can be embedded within the GRUB @file{core.img}
8e15ce
 using the @code{--pubkey} option to @command{grub-install}
8e15ce
-(@pxref{Invoking grub-install}).
8e15ce
+(@pxref{Invoking grub2-install}).
8e15ce
+
8e15ce
+@comment Unfortunately --pubkey is not yet supported by grub2-install,
8e15ce
+@comment but we should not bring up internal detail grub2-mkimage here
8e15ce
+@comment in the user guide (as opposed to developer's manual).
8e15ce
+
8e15ce
+@comment An initial trusted public key can be embedded within the GRUB
8e15ce
+@comment @file{core.img} using the @code{--pubkey} option to
8e15ce
+@comment @command{grub2-mkimage} (@pxref{Invoking grub2-install}).  Presently it
8e15ce
+@comment is necessary to write a custom wrapper around @command{grub2-mkimage}
8e15ce
+@comment using the @code{--grub-mkimage} flag to @command{grub2-install}.
8e15ce
 
8e15ce
 GRUB uses GPG-style detached signatures (meaning that a file
8e15ce
 @file{foo.sig} will be produced when file @file{foo} is signed), and
8e15ce
@@ -5907,8 +5924,8 @@ gpg --detach-sign /path/to/file
8e15ce
 For successful validation of all of GRUB's subcomponents and the
8e15ce
 loaded OS kernel, they must all be signed.  One way to accomplish this
8e15ce
 is the following (after having already produced the desired
8e15ce
-@file{grub.cfg} file, e.g., by running @command{grub-mkconfig}
8e15ce
-(@pxref{Invoking grub-mkconfig}):
8e15ce
+@file{grub.cfg} file, e.g., by running @command{grub2-mkconfig}
8e15ce
+(@pxref{Invoking grub2-mkconfig}):
8e15ce
 
8e15ce
 @example
8e15ce
 @group
8e15ce
@@ -5930,7 +5947,7 @@ See also: @ref{check_signatures}, @ref{verify_detached}, @ref{trust},
8e15ce
 Note that internally signature enforcement is controlled by setting
8e15ce
 the environment variable @code{check_signatures} equal to
8e15ce
 @code{enforce}.  Passing one or more @code{--pubkey} options to
8e15ce
-@command{grub-mkimage} implicitly defines @code{check_signatures}
8e15ce
+@command{grub2-mkimage} implicitly defines @code{check_signatures}
8e15ce
 equal to @code{enforce} in @file{core.img} prior to processing any
8e15ce
 configuration files.
8e15ce
 
8e15ce
@@ -6388,10 +6405,10 @@ Required files are:
8e15ce
 
8e15ce
 GRUB's normal start-up procedure involves setting the @samp{prefix}
8e15ce
 environment variable to a value set in the core image by
8e15ce
-@command{grub-install}, setting the @samp{root} variable to match, loading
8e15ce
+@command{grub2-install}, setting the @samp{root} variable to match, loading
8e15ce
 the @samp{normal} module from the prefix, and running the @samp{normal}
8e15ce
 command (@pxref{normal}).  This command is responsible for reading
8e15ce
-@file{/boot/grub/grub.cfg}, running the menu, and doing all the useful
8e15ce
+@file{/boot/grub2/grub.cfg}, running the menu, and doing all the useful
8e15ce
 things GRUB is supposed to do.
8e15ce
 
8e15ce
 If, instead, you only get a rescue shell, this usually means that GRUB
8e15ce
@@ -6417,8 +6434,8 @@ normal
8e15ce
 
8e15ce
 However, any problem that leaves you in the rescue shell probably means that
8e15ce
 GRUB was not correctly installed.  It may be more useful to try to reinstall
8e15ce
-it properly using @kbd{grub-install @var{device}} (@pxref{Invoking
8e15ce
-grub-install}).  When doing this, there are a few things to remember:
8e15ce
+it properly using @kbd{grub2-install @var{device}} (@pxref{Invoking
8e15ce
+grub2-install}).  When doing this, there are a few things to remember:
8e15ce
 
8e15ce
 @itemize @bullet{}
8e15ce
 @item
8e15ce
@@ -6430,7 +6447,7 @@ is usually better to use UUIDs or file system labels and avoid depending on
8e15ce
 drive ordering entirely.
8e15ce
 
8e15ce
 @item
8e15ce
-At least on BIOS systems, if you tell @command{grub-install} to install GRUB
8e15ce
+At least on BIOS systems, if you tell @command{grub2-install} to install GRUB
8e15ce
 to a partition but GRUB has already been installed in the master boot
8e15ce
 record, then the GRUB installation in the partition will be ignored.
8e15ce
 
8e15ce
@@ -6461,21 +6478,21 @@ entry which claims partition start at block 0. This change will not hamper
8e15ce
 bootability on other machines.
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-install
8e15ce
-@chapter Invoking grub-install
8e15ce
+@node Invoking grub2-install
8e15ce
+@chapter Invoking grub2-install
8e15ce
 
8e15ce
-The program @command{grub-install} generates a GRUB core image using
8e15ce
-@command{grub-mkimage} and installs it on your system.  You must specify the
8e15ce
+The program @command{grub2-install} generates a GRUB core image using
8e15ce
+@command{grub2-mkimage} and installs it on your system.  You must specify the
8e15ce
 device name on which you want to install GRUB, like this:
8e15ce
 
8e15ce
 @example
8e15ce
-grub-install @var{install_device}
8e15ce
+grub2-install @var{install_device}
8e15ce
 @end example
8e15ce
 
8e15ce
 The device name @var{install_device} is an OS device name or a GRUB
8e15ce
 device name.
8e15ce
 
8e15ce
-@command{grub-install} accepts the following options:
8e15ce
+@command{grub2-install} accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
 @item --help
8e15ce
@@ -6491,13 +6508,13 @@ separate partition or a removable disk.
8e15ce
 If this option is not specified then it defaults to @file{/boot}, so
8e15ce
 
8e15ce
 @example
8e15ce
-@kbd{grub-install /dev/sda}
8e15ce
+@kbd{grub2-install /dev/sda}
8e15ce
 @end example
8e15ce
 
8e15ce
 is equivalent to
8e15ce
 
8e15ce
 @example
8e15ce
-@kbd{grub-install --boot-directory=/boot/ /dev/sda}
8e15ce
+@kbd{grub2-install --boot-directory=/boot/ /dev/sda}
8e15ce
 @end example
8e15ce
 
8e15ce
 Here is an example in which you have a separate @dfn{boot} partition which is 
8e15ce
@@ -6505,16 +6522,16 @@ mounted on
8e15ce
 @file{/mnt/boot}:
8e15ce
 
8e15ce
 @example
8e15ce
-@kbd{grub-install --boot-directory=/mnt/boot /dev/sdb}
8e15ce
+@kbd{grub2-install --boot-directory=/mnt/boot /dev/sdb}
8e15ce
 @end example
8e15ce
 
8e15ce
 @item --recheck
8e15ce
-Recheck the device map, even if @file{/boot/grub/device.map} already
8e15ce
+Recheck the device map, even if @file{/boot/grub2/device.map} already
8e15ce
 exists. You should use this option whenever you add/remove a disk
8e15ce
 into/from your computer.
8e15ce
 
8e15ce
 @item --no-rs-codes
8e15ce
-By default on x86 BIOS systems, @command{grub-install} will use some
8e15ce
+By default on x86 BIOS systems, @command{grub2-install} will use some
8e15ce
 extra space in the bootloader embedding area for Reed-Solomon
8e15ce
 error-correcting codes. This enables GRUB to still boot successfully
8e15ce
 if some blocks are corrupted.  The exact amount of protection offered
8e15ce
@@ -6527,17 +6544,17 @@ installation}) where GRUB does not reside in any unpartitioned space
8e15ce
 outside of the MBR.  Disable the Reed-Solomon codes with this option.
8e15ce
 @end table
8e15ce
 
8e15ce
-@node Invoking grub-mkconfig
8e15ce
-@chapter Invoking grub-mkconfig
8e15ce
+@node Invoking grub2-mkconfig
8e15ce
+@chapter Invoking grub2-mkconfig
8e15ce
 
8e15ce
-The program @command{grub-mkconfig} generates a configuration file for GRUB
8e15ce
+The program @command{grub2-mkconfig} generates a configuration file for GRUB
8e15ce
 (@pxref{Simple configuration}).
8e15ce
 
8e15ce
 @example
8e15ce
-grub-mkconfig -o /boot/grub/grub.cfg
8e15ce
+grub-mkconfig -o /boot/grub2/grub.cfg
8e15ce
 @end example
8e15ce
 
8e15ce
-@command{grub-mkconfig} accepts the following options:
8e15ce
+@command{grub2-mkconfig} accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
 @item --help
8e15ce
@@ -6553,17 +6570,17 @@ it to standard output.
8e15ce
 @end table
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-mkpasswd-pbkdf2
8e15ce
-@chapter Invoking grub-mkpasswd-pbkdf2
8e15ce
+@node Invoking grub2-mkpasswd-pbkdf2
8e15ce
+@chapter Invoking grub2-mkpasswd-pbkdf2
8e15ce
 
8e15ce
-The program @command{grub-mkpasswd-pbkdf2} generates password hashes for
8e15ce
+The program @command{grub2-mkpasswd-pbkdf2} generates password hashes for
8e15ce
 GRUB (@pxref{Security}).
8e15ce
 
8e15ce
 @example
8e15ce
 grub-mkpasswd-pbkdf2
8e15ce
 @end example
8e15ce
 
8e15ce
-@command{grub-mkpasswd-pbkdf2} accepts the following options:
8e15ce
+@command{grub2-mkpasswd-pbkdf2} accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
 @item -c @var{number}
8e15ce
@@ -6581,23 +6598,23 @@ Length of the salt.  Defaults to 64.
8e15ce
 @end table
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-mkrelpath
8e15ce
-@chapter Invoking grub-mkrelpath
8e15ce
+@node Invoking grub2-mkrelpath
8e15ce
+@chapter Invoking grub2-mkrelpath
8e15ce
 
8e15ce
-The program @command{grub-mkrelpath} makes a file system path relative to
8e15ce
+The program @command{grub2-mkrelpath} makes a file system path relative to
8e15ce
 the root of its containing file system.  For instance, if @file{/usr} is a
8e15ce
 mount point, then:
8e15ce
 
8e15ce
 @example
8e15ce
-$ @kbd{grub-mkrelpath /usr/share/grub/unicode.pf2}
8e15ce
+$ @kbd{grub2-mkrelpath /usr/share/grub/unicode.pf2}
8e15ce
 @samp{/share/grub/unicode.pf2}
8e15ce
 @end example
8e15ce
 
8e15ce
 This is mainly used internally by other GRUB utilities such as
8e15ce
-@command{grub-mkconfig} (@pxref{Invoking grub-mkconfig}), but may
8e15ce
+@command{grub2-mkconfig} (@pxref{Invoking grub2-mkconfig}), but may
8e15ce
 occasionally also be useful for debugging.
8e15ce
 
8e15ce
-@command{grub-mkrelpath} accepts the following options:
8e15ce
+@command{grub2-mkrelpath} accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
 @item --help
8e15ce
@@ -6608,17 +6625,17 @@ Print the version number of GRUB and exit.
8e15ce
 @end table
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-mkrescue
8e15ce
-@chapter Invoking grub-mkrescue
8e15ce
+@node Invoking grub2-mkrescue
8e15ce
+@chapter Invoking grub2-mkrescue
8e15ce
 
8e15ce
-The program @command{grub-mkrescue} generates a bootable GRUB rescue image
8e15ce
+The program @command{grub2-mkrescue} generates a bootable GRUB rescue image
8e15ce
 (@pxref{Making a GRUB bootable CD-ROM}).
8e15ce
 
8e15ce
 @example
8e15ce
 grub-mkrescue -o grub.iso
8e15ce
 @end example
8e15ce
 
8e15ce
-All arguments not explicitly listed as @command{grub-mkrescue} options are
8e15ce
+All arguments not explicitly listed as @command{grub2-mkrescue} options are
8e15ce
 passed on directly to @command{xorriso} in @command{mkisofs} emulation mode.
8e15ce
 Options passed to @command{xorriso} will normally be interpreted as
8e15ce
 @command{mkisofs} options; if the option @samp{--} is used, then anything
8e15ce
@@ -6633,7 +6650,7 @@ mkdir -p disk/boot/grub
8e15ce
 grub-mkrescue -o grub.iso disk
8e15ce
 @end example
8e15ce
 
8e15ce
-@command{grub-mkrescue} accepts the following options:
8e15ce
+@command{grub2-mkrescue} accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
 @item --help
8e15ce
@@ -6661,15 +6678,15 @@ Use @var{file} as the @command{xorriso} program, rather than the built-in
8e15ce
 default.
8e15ce
 
8e15ce
 @item --grub-mkimage=@var{file}
8e15ce
-Use @var{file} as the @command{grub-mkimage} program, rather than the
8e15ce
+Use @var{file} as the @command{grub2-mkimage} program, rather than the
8e15ce
 built-in default.
8e15ce
 @end table
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-mount
8e15ce
-@chapter Invoking grub-mount
8e15ce
+@node Invoking grub2-mount
8e15ce
+@chapter Invoking grub2-mount
8e15ce
 
8e15ce
-The program @command{grub-mount} performs a read-only mount of any file
8e15ce
+The program @command{grub2-mount} performs a read-only mount of any file
8e15ce
 system or file system image that GRUB understands, using GRUB's file system
8e15ce
 drivers via FUSE.  (It is only available if FUSE development files were
8e15ce
 present when GRUB was built.)  This has a number of uses:
8e15ce
@@ -6701,13 +6718,13 @@ even if nobody has yet written a FUSE module specifically for that file
8e15ce
 system type.
8e15ce
 @end itemize
8e15ce
 
8e15ce
-Using @command{grub-mount} is normally as simple as:
8e15ce
+Using @command{grub2-mount} is normally as simple as:
8e15ce
 
8e15ce
 @example
8e15ce
 grub-mount /dev/sda1 /mnt
8e15ce
 @end example
8e15ce
 
8e15ce
-@command{grub-mount} must be given one or more images and a mount point as
8e15ce
+@command{grub2-mount} must be given one or more images and a mount point as
8e15ce
 non-option arguments (if it is given more than one image, it will treat them
8e15ce
 as a RAID set), and also accepts the following options:
8e15ce
 
8e15ce
@@ -6729,13 +6746,13 @@ Show debugging output for conditions matching @var{string}.
8e15ce
 @item -K prompt|@var{file}
8e15ce
 @itemx --zfs-key=prompt|@var{file}
8e15ce
 Load a ZFS encryption key.  If you use @samp{prompt} as the argument,
8e15ce
-@command{grub-mount} will read a passphrase from the terminal; otherwise, it
8e15ce
+@command{grub2-mount} will read a passphrase from the terminal; otherwise, it
8e15ce
 will read key material from the specified file.
8e15ce
 
8e15ce
 @item -r @var{device}
8e15ce
 @itemx --root=@var{device}
8e15ce
 Set the GRUB root device to @var{device}.  You do not normally need to set
8e15ce
-this; @command{grub-mount} will automatically set the root device to the
8e15ce
+this; @command{grub2-mount} will automatically set the root device to the
8e15ce
 root of the supplied file system.
8e15ce
 
8e15ce
 If @var{device} is just a number, then it will be treated as a partition
8e15ce
@@ -6753,10 +6770,10 @@ Print verbose messages.
8e15ce
 @end table
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-probe
8e15ce
-@chapter Invoking grub-probe
8e15ce
+@node Invoking grub2-probe
8e15ce
+@chapter Invoking grub2-probe
8e15ce
 
8e15ce
-The program @command{grub-probe} probes device information for a given path
8e15ce
+The program @command{grub2-probe} probes device information for a given path
8e15ce
 or device.
8e15ce
 
8e15ce
 @example
8e15ce
@@ -6764,7 +6781,7 @@ grub-probe --target=fs /boot/grub
8e15ce
 grub-probe --target=drive --device /dev/sda1
8e15ce
 @end example
8e15ce
 
8e15ce
-@command{grub-probe} must be given a path or device as a non-option
8e15ce
+@command{grub2-probe} must be given a path or device as a non-option
8e15ce
 argument, and also accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
@@ -6777,16 +6794,16 @@ Print the version number of GRUB and exit.
8e15ce
 @item -d
8e15ce
 @itemx --device
8e15ce
 If this option is given, then the non-option argument is a system device
8e15ce
-name (such as @samp{/dev/sda1}), and @command{grub-probe} will print
8e15ce
+name (such as @samp{/dev/sda1}), and @command{grub2-probe} will print
8e15ce
 information about that device.  If it is not given, then the non-option
8e15ce
 argument is a filesystem path (such as @samp{/boot/grub}), and
8e15ce
-@command{grub-probe} will print information about the device containing that
8e15ce
+@command{grub2-probe} will print information about the device containing that
8e15ce
 part of the filesystem.
8e15ce
 
8e15ce
 @item -m @var{file}
8e15ce
 @itemx --device-map=@var{file}
8e15ce
 Use @var{file} as the device map (@pxref{Device map}) rather than the
8e15ce
-default, usually @samp{/boot/grub/device.map}.
8e15ce
+default, usually @samp{/boot/grub2/device.map}.
8e15ce
 
8e15ce
 @item -t @var{target}
8e15ce
 @itemx --target=@var{target}
8e15ce
@@ -6839,19 +6856,19 @@ Print verbose messages.
8e15ce
 @end table
8e15ce
 
8e15ce
 
8e15ce
-@node Invoking grub-script-check
8e15ce
-@chapter Invoking grub-script-check
8e15ce
+@node Invoking grub2-script-check
8e15ce
+@chapter Invoking grub2-script-check
8e15ce
 
8e15ce
-The program @command{grub-script-check} takes a GRUB script file
8e15ce
+The program @command{grub2-script-check} takes a GRUB script file
8e15ce
 (@pxref{Shell-like scripting}) and checks it for syntax errors, similar to
8e15ce
 commands such as @command{sh -n}.  It may take a @var{path} as a non-option
8e15ce
 argument; if none is supplied, it will read from standard input.
8e15ce
 
8e15ce
 @example
8e15ce
-grub-script-check /boot/grub/grub.cfg
8e15ce
+grub-script-check /boot/grub2/grub.cfg
8e15ce
 @end example
8e15ce
 
8e15ce
-@command{grub-script-check} accepts the following options:
8e15ce
+@command{grub2-script-check} accepts the following options:
8e15ce
 
8e15ce
 @table @option
8e15ce
 @item --help