--- trunk/mkinitrd-magellan/grubby/grubby.8	2010/09/14 19:37:00	1152
+++ trunk/grubby/grubby.8	2016/06/29 14:53:04	2966
@@ -1,32 +1,38 @@
 .TH GRUBBY 8 "Tue Jan 18 2005"
 .SH NAME
-grubby \- command line tool for configuring grub, lilo, and elilo
+grubby \- command line tool for configuring grub, lilo, elilo, yaboot and zipl
 
 .SH SYNOPSIS
 \fBgrubby\fR [--add-kernel=\fIkernel-path\fR] [--args=\fIargs\fR] 
        [--bad-image-okay] [--boot-filesystem=\fIbootfs\fR] 
-       [--bootloader-probe] [--config-file \fIpath\fR] 
-       [--copy-default] [--default-kernel] 
+       [--bootloader-probe] [--config-file \fIpath\fR] [--copy-default]
+       [--debug] [--default-kernel] [--default-index] [--default-title]
+       [--devtree=\fIdevicetree.dtb\fR]
        [--grub] [--lilo] [--yaboot] [--silo] [--zipl]
        [--info=\fIkernel-path\fR] [--initrd=\fIinitrd-path\fR] 
        [--make-default] [-o path] [--version]
        [--remove-kernel=\fIkernel-path\fR] [--remove-args=\fIargs\fR]
-       [--set-default=\fIkernel-path\fR] [--title=entry-title]
-       [--add-multiboot=\fImultiboot-path\fR] [--mbargs=\fIargs\fR]
-       [--remove-multiboot=\fImultiboot-path\fR] [--remove-mbargs=\fIargs\fR]
+       [--set-default=\fIkernel-path\fR] [--set-default-index=\fientry-index\fR]
+       [--title=entry-title] [--add-multiboot=\fImultiboot-path\fR]
+       [--mbargs=\fIargs\fR] [--remove-multiboot=\fImultiboot-path\fR]
+       [--remove-mbargs=\fIargs\fR]
 
 .SH DESCRIPTION
 \fBgrubby\fR is a command line tool for updating and displaying information
-about the configuration files for the \fBgrub\fR, \fBlilo\fR, \fBelilo\fR 
+about the configuration files for the \fBgrub\fR, \fBlilo\fR, \fBelilo\fR
 (ia64), \fByaboot\fR (powerpc) and \fBzipl\fR (s390) boot loaders. It
 is primarily designed to be used from scripts which install new
 kernels and need to find information about the current boot environment.
 
-On Intel x86 platforms, \fBgrub\fR is the default bootloader and the
-configuration file is in \fB/boot/grub/grub.conf\fR. On Intel ia64 platforms, 
-\fBelilo\fR mode is used and the default location for the configuration file 
-is \fB/boot/grub/grub.conf\fR. On PowerPC platforms, \fByaboot\fR parsing
-is used and the configuration file should be in \fB/etc/yaboot.conf\fR.
+On BIOS-based Intel x86 platforms, \fBgrub2\fR is the default bootloader and
+the configuration file is in \fB/boot/grub2/grub.cfg\fR.  On UEFI-based Intel
+x86 platforms, \fBgrub2\fR is the default bootloader, and the configuration
+file is in \fB/boot/efi/EFI/redhat/grub.cfg\fR.  On Intel ia64 platforms,
+\fBelilo\fR mode is used and the default location for the configuration file
+is \fB/boot/efi/EFI/redhat/elilo.conf\fR. On PowerPC platforms, systems based
+on Power8 now support \fBgrub2\fR as a bootloader and store using a default
+config stored in \fB/boot/grub2/grub.cfg\fR. The earlier Power7 systems use \fByaboot\fR
+parsing and the configuration file should be in \fB/etc/yaboot.conf\fR.
 
 There are a number of ways to specify the kernel used for \fB-\-info\fR,
 \fB-\-remove-kernel\fR, and \fB-\-update-kernel\fR. Specificying \fBDEFAULT\fR
@@ -94,10 +100,27 @@
 and initrd path will never be copied.
 
 .TP
+\fB-\-debug\fR
+Display extra debugging information for failures.
+
+.TP
 \fB-\-default-kernel\fR
 Display the full path to the current default kernel and exit.
 
 .TP
+\fB-\-default-index\fR
+Display the numeric index of the current default boot entry and exit.
+
+.TP
+\fB-\-default-title\fR
+Display the title of the current default boot entry and exit.
+
+.TP
+\fB-\-devtree\fR=\fIpath\fR
+Use \fIpath\fR for device tree path in place of the path of any devicetree
+directive found in the template stanza.
+
+.TP
 \fB-\-elilo\fR
 Use an \fBelilo\fR style configuration file.
 
@@ -142,6 +165,10 @@
 boot entry.
 
 .TP
+\fB-\-set-default-index\fR=\fIentry-index\fR
+Makes the given entry number the default boot entry.
+
+.TP
 \fB-\-title\fR=\fIentry-title\fR
 When a new kernel entry is added \fIentry-title\fR is used as the title
 (\fBlilo\fR label) for the entry. If \fIentry-title\fR is longer then maximum
@@ -207,6 +234,7 @@
 
 .SH AUTHORS
 .nf
-Erik Troan <ewt@redhat.com>
-Jeremy Katz <katzj@redhat.com>
+Erik Troan
+Jeremy Katz
+Peter Jones
 .fi