commit 41337a45dece72484dcd6092909b3556cae66cf4
Author: Jack Reed <jreed(a)redhat.com>
Date: Tue Dec 4 13:43:18 2012 +1000
Move and first update of bootloader section
en-US/Disk_Partitioning-x86.xml | 2 +-
en-US/Disk_Partitioning_Setup-x86.xml | 6 +-
en-US/Graphical_Installation-x86.xml | 3 +-
en-US/Upgrading-common-procedure-1.xml | 34 +++++++
en-US/Upgrading-grub-EFI-procedure-1.xml | 59 +++++++++++++
en-US/X86_Bootloader.xml | 110 +++++++++++++----------
en-US/images/x86-bootloader/x86-bootloader.png | Bin 27546 -> 16216 bytes
7 files changed, 162 insertions(+), 52 deletions(-)
---
diff --git a/en-US/Disk_Partitioning-x86.xml b/en-US/Disk_Partitioning-x86.xml
index 4fc0841..6e3fa54 100644
--- a/en-US/Disk_Partitioning-x86.xml
+++ b/en-US/Disk_Partitioning-x86.xml
@@ -45,7 +45,7 @@
<xi:include href="Disk_Partitioning_Graphical_common-para-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Anaconda displays several details for each device listed -->
<xi:include href="Disk_Partitioning_Graphical_common-para-3.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- To change which drive/s a mount point should be located on -->
<para>
- At the bottom of the screen, a link will state how many storage devices were selected
in <guilabel>Installation Destination</guilabel> — refer to <xref
linkend="s1-diskpartsetup-x86" />. To specify which will serve as the boot
device, click the link to open the <guilabel>Selected Devices</guilabel>
dialog.
+ At the bottom of the screen, a link will state how many storage devices were selected
in <guilabel>Installation Destination</guilabel> — refer to <xref
linkend="s1-diskpartsetup-x86" />. This link opens the
<guilabel>Selected Devices</guilabel> dialog, where you can specify which
device the bootloader should be installed on. Refer to <xref
linkend="s1-x86-bootloader" /> for more information.
</para>
<!-- <xi:include href="Disk_Partitioning_Graphical_common-para-4.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<!-- Using your mouse, click once to highlight a particular field... -->
<!-- <xi:include
href="Disk_Partitioning_Graphical_common-variablelist-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml
b/en-US/Disk_Partitioning_Setup-x86.xml
index 3a14aed..5de1109 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -43,7 +43,11 @@
<!-- To partition the drive manually... --> <xi:include
href="Disk_Partitioning_Setup_common-important-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Important - chain loading... --> <xi:include
href="Disk_Partitioning_Setup_common-important-2.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Important - multipath and non-multipath... --> <xi:include
href="Automatic_Partitioning_common-para-8.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Click Continue to proceed... -->
+ <!-- Click Continue to proceed... -->
+
+
+ <xi:include href="X86_Bootloader.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- x86, AMD64, and Intel 64 Boot Loader Configuration -->
</section>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 042c8c2..7fb5ec1 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -165,8 +165,7 @@
Recommended Partitioning Scheme
Adding Partitions
Editing Partitions --> <xi:include
href="Write_changes_to_disk_x86.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- The installer prompts you to confirm the partitioning options that you
selected. --> <xi:include href="X86_Bootloader.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- x86, AMD64, and Intel 64 Boot Loader Configuration --> <!--
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Netconfig-x86.xml"/> --> <!-- Network Configuration -->
<!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Time_Zone-x86.xml"/> --> <!-- Time Zone --> <!-- for
RHEL goes here --> <!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Account_Configuration-common.xml"/> --> <!-- Account
Configuration --> <!-- for RHEL goes here --> <!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Prepare_To_Install-x86.xml"/> --> <!-- Prepare to Install
--> <xi:include href="Progress_Hub-x86.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The installer prompts you to confirm the partitioning options that you
selected. --> <!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Netconfig-x86.xml"/> --> <!-- Network Configuration -->
<!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Time_Zone-x86.xml"/> --> <!-- Time Zone --> <!-- for
RHEL goes here --> <!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Account_Configuration-common.xml"/> --> <!-- Account
Configuration --> <!-- for RHEL goes here --> <!-- <xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="Prepare_To_Install-x86.xml"/> --> <!-- Prepare to Install
--> <xi:include href="Progress_Hub-x86.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Installing Packages --> <xi:include href="Complete-x86.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Installation Complete -->
</chapter>
diff --git a/en-US/Upgrading-common-procedure-1.xml
b/en-US/Upgrading-common-procedure-1.xml
new file mode 100644
index 0000000..148478e
--- /dev/null
+++ b/en-US/Upgrading-common-procedure-1.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
+ <procedure>
+ <step>
+ <para>
+ Install <application>fedup</application> with your graphical package
manager, or type <command>yum install fedup</command> at the command line and
press <keycap>Enter</keycap>.
+ </para>
+ </step>
+ <step>
+ <para>
+ To run <application>fedup</application>, type
<command>fedup-cli</command> at the command line as root and press
<keycap>Enter</keycap>.
+ </para>
+ </step>
+ <step>
+ <para>
+ If <command>fedup-cli</command> runs successfully without errors, reboot
your system.
+ </para>
+ </step>
+ <step>
+ <para>
+ In the GRUB menu at startup, select the new entry: <guilabel>System
Upgrade</guilabel>.
+ </para>
+ </step>
+ <step>
+ <para>
+ <application>fedup</application> will now upgrade your system. It will
again reboot the system on completion, and an option to boot Fedora &PRODVER; will
then be present in the GRUB menu.
+ </para>
+ </step>
+</procedure>
+
diff --git a/en-US/Upgrading-grub-EFI-procedure-1.xml
b/en-US/Upgrading-grub-EFI-procedure-1.xml
new file mode 100644
index 0000000..43c1ca4
--- /dev/null
+++ b/en-US/Upgrading-grub-EFI-procedure-1.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE figure PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
+ <procedure>
+ <step>
+ <para>
+ Install GRUB2 for EFI by running the following command:
+ </para>
+<screen><command>sudo yum install grub2-efi</command></screen>
+ </step>
+ <step>
+ <para>
+ After the package has been installed, you will need to add a new EFI boot entry.
You can base it on the command used when Fedora was first installed, which can be found in
<filename>/var/log/anaconda/anaconda.program.log</filename> and should end
with a command similar to:
+ </para>
+<screen><command>efibootmgr -c -w -L Fedora -d /dev/sdX -p Y -l
\EFI\redhat\grub.efi</command></screen>
+ <para>
+ Make a note of this command.
+ </para>
+</step>
+
+ <step>
+ <para>
+ Find the current boot number for Fedora using
<application>efibootmgr</application>:
+ </para>
+<screen><command>efibootmgr -v</command></screen>
+ <para>
+ In the output, look for a line similar to the following:
+ </para>
+<screen>Boot0012* Fedora
HD(1,800,34800,6733749f-b42a-4b8c-a0de-5a1d3505f8af)File(\EFI\fedora\grubx64.efi)</screen>
+ <para>
+ In this example, the boot number is 0012.
+ </para>
+ </step>
+ <step>
+ <para>
+ Remove the old boot entry with the following command:
+ </para>
+<screen><command>efibootmgr -b
<replaceable>bootnumber</replaceable> -B</command></screen>
+ </step>
+ <step>
+ <para>
+ You can now create a new boot entry for
<application>grub2-efi</application>. The command is run as root or
<application>sudo</application> and is a modification of the command generated
in step 2 appended with the boot number. The path to the
<filename>.efi</filename> file is edited to reflect GRUB2 and must be in
quotation marks or the system will not boot:
+ </para>
+ <screen><command>sudo efibootmgr -c -w -L Fedora -d /dev/sdX -p Y -l
'\EFI\fedora\grubx64.efi' -b
<replaceable>bootnumber</replaceable></command></screen>
+ </step>
+ <step>
+ <para>
+ Finally, refresh the <filename>grub.cfg</filename> file and establish
a symlink to <filename>/etc/grub2-efi.cfg</filename>:
+ </para>
+<screen><command>grub2-mkconfig -o
/boot/efi/EFI/fedora/grub.cfg</command></screen>
+ <para>
+ After the next reboot, your system will be using
<application>grub2-efi</application>.
+ </para>
+ </step>
+</procedure>
+
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index ebafbce..ce85bb9 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -4,7 +4,7 @@
%BOOK_ENTITIES;
]>
<section id="s1-x86-bootloader">
- <title>x86, AMD64, and Intel 64 Boot Loader Configuration</title>
+ <title>x86, AMD64, and Intel 64 Boot Loader Installation</title>
<indexterm significance="normal">
<primary>boot loader</primary>
@@ -19,18 +19,18 @@
</indexterm>
<indexterm significance="normal">
- <primary>configuration</primary>
+ <primary>installation</primary>
<secondary>GRUB</secondary>
</indexterm>
<indexterm significance="normal">
<primary>GRUB</primary>
- <secondary>configuration</secondary>
+ <secondary>installation</secondary>
</indexterm>
<indexterm significance="normal">
<primary>boot loader</primary>
- <secondary>configuration</secondary>
+ <secondary>installation</secondary>
</indexterm>
<indexterm significance="normal">
@@ -40,13 +40,13 @@
<para>
To boot the system without boot media, you usually need to install a boot loader. A
boot loader is the first software program that runs when a computer starts. It is
responsible for loading and transferring control to the operating system kernel software.
The kernel, in turn, initializes the rest of the operating system.
</para>
- <important>
+ <!-- <important>
<title>Installing in text mode</title>
<para>
If you install Fedora in text mode, the installer configures the bootloader
automatically and you cannot customize bootloader settings during the installation
process.
</para>
- </important>
+ </important> -->
<para>
GRUB (GRand Unified Bootloader), which is installed by default, is a very powerful boot
loader. GRUB can load a variety of free operating systems, as well as proprietary
operating systems with chain-loading (the mechanism for loading unsupported operating
systems, such as Windows, by loading another boot loader). Note that
Fedora &PRODVER; uses GRUB 2. GRUB Legacy is no longer actively
developed.<footnote>
<para>
@@ -61,22 +61,7 @@
</para>
</note>
- <figure float="0" id="fig-x86-bootloader">
- <title>Boot Loader Configuration</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/x86-bootloader/x86-bootloader.png"
format="PNG" width="444" />
- </imageobject>
- <textobject>
- <para>
- Configure how you would like to boot the system.
- </para>
-
- </textobject>
-
- </mediaobject>
-
- </figure>
+
<!-- <para>
If you do not want to install GRUB as your boot loader, click <guibutton>Change
boot loader</guibutton>, where you can choose not to install a boot loader at all.
</para>
@@ -85,7 +70,7 @@
If you already have a boot loader that can boot Fedora and do not want to overwrite
your current boot loader, choose <guilabel>Do not install a boot
loader</guilabel> by clicking on the <guibutton>Change
boot loader</guibutton> button.
</para> --> <para>
- If there are no other operating systems on your computer, or you are completely
removing any other operating systems the installation program will install
<application>GRUB</application> as your boot loader without any intervention.
In that case you may continue on to <xref linkend="s1-pkgselection-x86"
/>.
+ If there are no other operating systems on your computer, or you are completely
removing any other operating systems the installation program will install
<application>GRUB</application> as your boot loader without any intervention.
</para>
<para>
You may have a boot loader installed on your system already. An operating system may
install its own preferred boot loader, or you may have installed a third-party boot
loader. If your boot loader does not recognize Linux partitions, you may not be able to
boot Fedora. Use <application>GRUB</application> as your boot loader to boot
Linux and most other operating systems. Follow the directions in this chapter to install
<application>GRUB</application>.
@@ -98,7 +83,7 @@
</warning>
<para>
- By default, the installation program installs GRUB in the master boot record or
<abbrev>MBR</abbrev>, of the device for the root file system. To decline
installation of a new boot loader, unselect <guilabel>Install boot loader on
/dev/sda</guilabel>.
+ <!-- By default -->The installation program installs GRUB in the master boot
record or <abbrev>MBR</abbrev>, of the device for the root file system. To
decline installation of a new boot loader, unselect <guilabel>Install boot loader on
/dev/sda</guilabel>.
</para>
<warning>
<title>Warning</title>
@@ -112,7 +97,33 @@
</para> --> <para>
If you have other operating systems already installed, Fedora attempts to automatically
detect and configure <application>GRUB</application> to boot them. You may
manually configure any additional operating systems if
<application>GRUB</application> does not detect them.
</para>
- <para>
+
+ <figure float="0" id="fig-x86-bootloader">
+ <title>Specify a Boot Device</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/x86-bootloader/x86-bootloader.png"
format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ Specify the boot device, or choose not to install a bootloader.
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+
+ </figure>
+
+ <para>
+ To specify which device the bootloader should be installed on, select the
<guilabel>Full disk summary and options</guilabel> link at the bottom of the
<guilabel>Installation Destination</guilabel> screen. The
<guilabel>Selected Disks</guilabel> dialog will appear. If you are
partitioning the drive manually (refer to <xref
linkend="s1-diskpartitioning-x86" />), this dialog can be reached by clicking
the <guilabel>Storage device/s selected</guilabel> link on the
<guilabel>Manual Partitioning</guilabel> screen.
+ </para>
+
+ <para>
+ Select a device from the list, and click <guibutton>Set as Boot
Device</guibutton>. A green tick next to the device in the boot column will appear
to confirm that the bootloader will be installed on it.
+ </para>
+
+ <!-- <para>
To add, remove, or change the detected operating system settings, use the options
provided.
</para>
<variablelist>
@@ -203,18 +214,18 @@
<para>
<application>GRUB</application> stores the password in encrypted form, so
it <emphasis>cannot</emphasis> be read or recovered. If you forget the boot
password, boot the system normally and then change the password entry in the
<filename>/etc/grub.d/00_header</filename> file. Then, run the following
command with root privileges to update the <filename>grub.cfg</filename> file
with your updated password:
</para>
-<screen><command>grub2-mkconfig
--output=/boot/grub2/grub.cfg</command></screen>
+<screen><command>grub2-mkconfig -o
/boot/grub2/grub.cfg</command></screen>
<para>
If you cannot boot, you may be able to use the <systemitem>rescue
mode</systemitem> on the Fedora installation DVD to reset the GRUB password.
</para>
<para>
You can later change the username in the
<filename>/etc/grub.d/01_users</filename> file.
- </para>
+ </para> -->
<!-- <para>
If you do need to change the <application>GRUB</application> password, use
the <command>grub-md5-crypt</command> utility. For information on using this
utility, use the command <command>man grub-md5-crypt</command> in a terminal
window to read the manual pages.
</para> -->
- <important>
+ <!-- <important>
<title>GRUB recognizes only the QWERTY keyboard layout</title>
<para>
When selecting a GRUB password, be aware that GRUB recognizes only the QWERTY keyboard
layout, regardless of the keyboard actually attached to the system. If you use a keyboard
with a significantly different layout, it might be more effective to memorize a pattern of
keystrokes rather than the word that the pattern produces.
@@ -222,9 +233,23 @@
</important>
<para>
- To configure more advanced boot loader options, such as changing the drive order or
passing options to the kernel, be sure <guilabel>Configure advanced boot loader
options</guilabel> is selected before clicking
<guibutton>Next</guibutton>.
- </para>
- <section id="x86-bootloader-adv">
+ To configure more advanced boot loader options, such as changing the drive order or
passing options to the kernel, be sure <guilabel>Configure advanced boot loader
options</guilabel> is selected before clicking
<guibutton>Next</guibutton>.
+ </para> -->
+
+ <warning>
+ <title>If installing from USB, ensure boot loader is installed to hard
drive</title>
+ <para>
+ If you are installing Fedora from a USB, the boot loader will by default be installed
to the MBR on the USB rather than the MBR on the hard drive. This will prevent the system
booting once the installation is complete. To avoid this, select <guibutton>Change
Device</guibutton> and reverse the order of the BIOS drives.
<filename>/dev/sda</filename> is typically the hard drive and should be first
in the BIOS Drive Order.
+ </para>
+ </warning>
+ <!-- <para>
+ The <guilabel>Force LBA32 (not normally required)</guilabel> option allows
you to exceed the 1024 cylinder limit for the <filename>/boot/</filename>
partition. If you have a system which supports the LBA32 extension for booting operating
systems above the 1024 cylinder limit, and you want to place your
<filename>/boot/</filename> partition above cylinder 1024, you should select
this option.
+ </para> --><xi:include href="X86_Bios_Tip.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- <para>
+ To add default options to the boot command, enter them into the <guilabel>Kernel
parameters</guilabel> field. Any options you enter are passed to the Linux kernel
every time it boots.
+ </para> -->
+
+ <!-- <section id="x86-bootloader-adv">
<title>Advanced Boot Loader Configuration</title>
<indexterm significance="normal">
<primary>boot loader</primary>
@@ -240,8 +265,8 @@
<primary>OS/2 boot manager</primary>
</indexterm>
- <xi:include
href="Assign_Storage_Devices-common-important-indexterm-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Chain loading --> <para>
+ <xi:include href="Assign_Storage_Devices-common-important-indexterm-1.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Chain loading --> <!-- <para>
Now that you have chosen which boot loader to install, you can also determine where
you want the boot loader to be installed. You may install the boot loader in one of two
places:
</para>
<itemizedlist>
@@ -300,21 +325,10 @@
<para>
Click the <guibutton>Change Drive Order</guibutton> button if you would
like to rearrange the drive order or if your BIOS does not return the correct drive order.
Changing the drive order may be useful if you have multiple SCSI adapters, or both SCSI
and IDE adapters, and you want to boot from the SCSI device.
</para>
- <warning>
- <title>If installing from USB, ensure boot loader is installed to hard
drive</title>
- <para>
- If you are installing Fedora from a USB, the boot loader will by default be installed
to the MBR on the USB rather than the MBR on the hard drive. This will prevent the system
booting once the installation is complete. To avoid this, select <guibutton>Change
Device</guibutton> and reverse the order of the BIOS drives.
<filename>/dev/sda</filename> is typically the hard drive and should be first
in the BIOS Drive Order.
- </para>
- </warning>
- <!-- <para>
- The <guilabel>Force LBA32 (not normally required)</guilabel> option allows
you to exceed the 1024 cylinder limit for the <filename>/boot/</filename>
partition. If you have a system which supports the LBA32 extension for booting operating
systems above the 1024 cylinder limit, and you want to place your
<filename>/boot/</filename> partition above cylinder 1024, you should select
this option.
- </para> --><xi:include href="X86_Bios_Tip.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- <para>
- To add default options to the boot command, enter them into the <guilabel>Kernel
parameters</guilabel> field. Any options you enter are passed to the Linux kernel
every time it boots.
- </para> -->
- </section>
+
+ </section> -->
- <section id="s2-x86-bootloader-rescue">
+ <!-- <section id="s2-x86-bootloader-rescue">
<title>Rescue Mode</title>
<indexterm significance="normal">
<primary>rescue mode</primary>
@@ -336,7 +350,7 @@
For additional information, refer to the <citetitle>Fedora Deployment
Guide</citetitle>.
</para>
- </section>
+ </section> -->
<section id="s2-x86-bootloader-alt">
<title>Alternative Boot Loaders</title>
diff --git a/en-US/images/x86-bootloader/x86-bootloader.png
b/en-US/images/x86-bootloader/x86-bootloader.png
index 0102cff..f704e35 100644
Binary files a/en-US/images/x86-bootloader/x86-bootloader.png and
b/en-US/images/x86-bootloader/x86-bootloader.png differ