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