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