commit 0f0040815732f36ea9b24d31f72f1f0d7fae549e
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Sun Nov 16 14:51:29 2014 +0100
Splitting StorageSpoke into more files so we can xref within the section
en-US/StorageSpoke.xml | 91 +-----------------------------------
en-US/StorageSpoke_BootLoader.xml | 93 +++++++++++++++++++++++++++++++++++++
prepare_anaconda_help_content.py | 1 +
3 files changed, 96 insertions(+), 89 deletions(-)
---
diff --git a/en-US/StorageSpoke.xml b/en-US/StorageSpoke.xml
index f9eae9a..d6d8671 100644
--- a/en-US/StorageSpoke.xml
+++ b/en-US/StorageSpoke.xml
@@ -63,7 +63,7 @@
</para>
</warning>
<para>
- To control which one of your selected storage devices will contain the
<firstterm>boot loader</firstterm>, click the <guilabel>Full disk
summary and bootloader</guilabel> link in the bottom left corner of the screen, and
follow the instructions below. Note that while in most cases it is sufficient to leave the
boot loader in the default location, some configurations (for example, systems which
require <firstterm>chain loading</firstterm> from another boot loader) will
require the boot drive to be specified manually.
+ To control which one of your selected storage devices will contain the
<firstterm>boot loader</firstterm>, click the <guilabel>Full disk
summary and bootloader</guilabel> link in the bottom left corner of the screen, and
follow the instructions in <xref
linkend="sect-installation-gui-storage-partitioning-bootloader" />. Note that
while in most cases it is sufficient to leave the boot loader in the default location,
some configurations (for example, systems which require <firstterm>chain
loading</firstterm> from another boot loader) will require the boot drive to be
specified manually.
</para>
<para>
After you select storage devices, choose between automatic and manual partitioning,
configure encryption and boot loader location, press <guilabel>Done</guilabel>
in the top left corner of the screen. Then, depending on your settings, the following will
happen:
@@ -102,93 +102,6 @@
</listitem>
</itemizedlist>
- <section id="sect-installation-gui-storage-partitioning-bootloader">
- <title>Boot Loader Installation</title>
- <para>
- &PRODUCT; uses <application>GRUB2</application> (GRand Unified
Bootloader version 2) as its boot loader. The boot loader is the first program that runs
when the computer starts and is responsible for loading and transferring control to an
operating system. <application>GRUB2</application> can boot any compatible
operating system (including Microsoft Windows) and can also use chain loading to transfer
control to other boot loaders for unsupported operating systems.
- </para>
- <warning>
- <para>
- Installing <application>GRUB2</application> may overwrite your existing
boot loader.
- </para>
- </warning>
- <para>
- If you have other operating systems already installed, the &PRODUCT; installer
will attempt to automatically detect and configure the boot loader to start them. You can
manually configure any additional operating systems after you finish the installation, if
they are not detected properly. For instructions on editing
<application>GRUB2</application> configuration, see the
<citetitle>&PRODUCT;
System Administrator's Guide</citetitle>, available at
<ulink
url="http://docs.fedoraproject.org/">&PRODUCT;
Documentation</ulink>
- </para>
- <para>
- To specify which device the boot loader should be installed on, click the
<guilabel>Full disk summary and bootloader</guilabel> link at the bottom of
the <guilabel>Installation Destination</guilabel> screen. The
<guilabel>Selected Disks</guilabel> dialog will appear. If you are configuring
your partitioning layout manually, the same dialog can be accessed from <xref
linkend="sect-installation-gui-manual-partitioning" /> using the
<guilabel><replaceable>X</replaceable> storage devices
selected</guilabel> link in the bottom left corner of the screen.
- </para>
- <para>
- <remark>TODO: screen</remark>
- </para>
- <para>
- In the <guilabel>Boot</guilabel> column, a "tick" icon marks one
of the devices as the intended boot device. To change the boot device, select a device
from the list and click the <guilabel>Set as Boot Device</guilabel> button to
install the boot loader there instead. Only one device can be set as the boot device.
- </para>
- <para>
- To decline installation of a new boot loader, select the device currently marked for
boot and click the <guilabel>Do not install bootloader</guilabel> button. This
will remove the tick and ensure <application>GRUB2</application> is not
installed on any device.
- </para>
- <warning>
- <para>
- If you choose not to install a boot loader for any reason, you will not be able to
boot the system directly, and you must use another boot method, such as a stand-alone
commercial boot loader application. Use this option only if you are sure you have another
way to boot your system.
- </para>
- </warning>
-
- <section id="sect-installation-gui-storage-partitioning-mbr-gpt">
- <title>MBR and GPT Considerations</title>
- <para>
- <application>GRUB2</application> can be installed either in the
<firstterm>Master Boot Record</firstterm> (MBR) or the <firstterm>GUID
Partition Table</firstterm> (GPT) of the boot device. In order to determine which of
these methods to use, the installation program considers the following variations:
- </para>
- <variablelist>
- <varlistentry>
- <term>Systems with BIOS firmware and UEFI systems in BIOS compatibility
mode</term>
- <listitem>
- <para>
- If the disk is already formatted, the partitioning scheme is retained.
- </para>
- <para>
- If the disk is not formatted, or you have erased all existing partitions from the
disk, the installer choose the following:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- MBR if the size of the disk is less than 2 TB (terabytes)
- </para>
- </listitem>
- <listitem>
- <para>
- GPT if the size of the disk is more than 2 TB
- </para>
- </listitem>
- </itemizedlist>
- <note>
- <para>
- You can force the installer to use GPT on disks smaller than 2 TB by using the
<option>inst.gpt</option> boot option as described in <xref
linkend="chap-anaconda-boot-options" />. However, the opposite is not
possible - you can not use MBR on disks larger than 2 TB.
- </para>
- </note>
- <para>
- You need to create a <firstterm>BIOS Boot</firstterm> partition with a
size of 1 MB to install on a system with BIOS firmware if the disk containing the boot
loader uses GPT. If the disk uses a MBR, no special partition is necessary on a BIOS
system.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Systems with UEFI firmware</term>
- <listitem>
- <para>
- Only GPT is allowed on UEFI systems. In order to install on a formatted disk with
a MBR, it must be reformated and relabeled. All data currently on the disk will be lost.
- </para>
- <para>
- UEFI-based systems require an <firstterm>EFI System
Partition</firstterm> at least 50 MB in size (recommended size is 200 MB),
regardless of the partitioning scheme.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <important>
- <para>
- If your system requires either a BIOS Boot partition or an EFI System Partition
based on the requirements detailed above, this partition must be created as a standard
physical partition. It can not reside on a LVM volume or a Btrfs subvolume.
- </para>
- </important>
- </section>
-
- </section>
+ <xi:include href="StorageSpoke_BootLoader.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</section>
diff --git a/en-US/StorageSpoke_BootLoader.xml b/en-US/StorageSpoke_BootLoader.xml
new file mode 100644
index 0000000..d3ebaa6
--- /dev/null
+++ b/en-US/StorageSpoke_BootLoader.xml
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE section 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;
+]>
+<section id="sect-installation-gui-storage-partitioning-bootloader">
+ <title>Boot Loader Installation</title>
+ <para>
+ &PRODUCT; uses <application>GRUB2</application> (GRand Unified
Bootloader version 2) as its boot loader. The boot loader is the first program that runs
when the computer starts and is responsible for loading and transferring control to an
operating system. <application>GRUB2</application> can boot any compatible
operating system (including Microsoft Windows) and can also use chain loading to transfer
control to other boot loaders for unsupported operating systems.
+ </para>
+ <warning>
+ <para>
+ Installing <application>GRUB2</application> may overwrite your
existing boot loader.
+ </para>
+ </warning>
+ <para>
+ If you have other operating systems already installed, the &PRODUCT;
installer will attempt to automatically detect and configure the boot loader to start
them. You can manually configure any additional operating systems after you finish the
installation, if they are not detected properly. For instructions on editing
<application>GRUB2</application> configuration, see the
<citetitle>&PRODUCT;
System Administrator's Guide</citetitle>, available at
<ulink
url="http://docs.fedoraproject.org/">&PRODUCT;
Documentation</ulink>
+ </para>
+ <para>
+ To specify which device the boot loader should be installed on, click the
<guilabel>Full disk summary and bootloader</guilabel> link at the bottom of
the <guilabel>Installation Destination</guilabel> screen. The
<guilabel>Selected Disks</guilabel> dialog will appear. If you are configuring
your partitioning layout manually, the same dialog can be accessed from <xref
linkend="sect-installation-gui-manual-partitioning" /> using the
<guilabel><replaceable>X</replaceable> storage devices
selected</guilabel> link in the bottom left corner of the screen.
+ </para>
+ <para>
+ <remark>TODO: screen</remark>
+ </para>
+ <para>
+ In the <guilabel>Boot</guilabel> column, a "tick" icon
marks one of the devices as the intended boot device. To change the boot device, select a
device from the list and click the <guilabel>Set as Boot Device</guilabel>
button to install the boot loader there instead. Only one device can be set as the boot
device.
+ </para>
+ <para>
+ To decline installation of a new boot loader, select the device currently marked
for boot and click the <guilabel>Do not install bootloader</guilabel> button.
This will remove the tick and ensure <application>GRUB2</application> is not
installed on any device.
+ </para>
+ <warning>
+ <para>
+ If you choose not to install a boot loader for any reason, you will not be
able to boot the system directly, and you must use another boot method, such as a
stand-alone commercial boot loader application. Use this option only if you are sure you
have another way to boot your system.
+ </para>
+ </warning>
+
+ <section id="sect-installation-gui-storage-partitioning-mbr-gpt">
+ <title>MBR and GPT Considerations</title>
+ <para>
+ <application>GRUB2</application> can be installed either in the
<firstterm>Master Boot Record</firstterm> (MBR) or the <firstterm>GUID
Partition Table</firstterm> (GPT) of the boot device. In order to determine which of
these methods to use, the installation program considers the following variations:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term>Systems with BIOS firmware and UEFI systems in BIOS
compatibility mode</term>
+ <listitem>
+ <para>
+ If the disk is already formatted, the partitioning scheme is
retained.
+ </para>
+ <para>
+ If the disk is not formatted, or you have erased all existing
partitions from the disk, the installer choose the following:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ MBR if the size of the disk is less than 2 TB
(terabytes)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ GPT if the size of the disk is more than 2 TB
+ </para>
+ </listitem>
+ </itemizedlist>
+ <note>
+ <para>
+ You can force the installer to use GPT on disks smaller than
2 TB by using the <option>inst.gpt</option> boot option as described in
<xref linkend="chap-anaconda-boot-options" />. However, the opposite is
not possible - you can not use MBR on disks larger than 2 TB.
+ </para>
+ </note>
+ <para>
+ You need to create a <firstterm>BIOS Boot</firstterm>
partition with a size of 1 MB to install on a system with BIOS firmware if the disk
containing the boot loader uses GPT. If the disk uses a MBR, no special partition is
necessary on a BIOS system.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Systems with UEFI firmware</term>
+ <listitem>
+ <para>
+ Only GPT is allowed on UEFI systems. In order to install on a
formatted disk with a MBR, it must be reformated and relabeled. All data currently on the
disk will be lost.
+ </para>
+ <para>
+ UEFI-based systems require an <firstterm>EFI System
Partition</firstterm> at least 50 MB in size (recommended size is 200 MB),
regardless of the partitioning scheme.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <important>
+ <para>
+ If your system requires either a BIOS Boot partition or an EFI System
Partition based on the requirements detailed above, this partition must be created as a
standard physical partition. It can not reside on a LVM volume or a Btrfs subvolume.
+ </para>
+ </important>
+ </section>
+
+</section>
diff --git a/prepare_anaconda_help_content.py b/prepare_anaconda_help_content.py
index 3e63b20..94d7b29 100755
--- a/prepare_anaconda_help_content.py
+++ b/prepare_anaconda_help_content.py
@@ -20,6 +20,7 @@ ANACONDA_HELP_FILES = [
"FilterSpoke.xml",
"PasswordSpoke.xml",
"StorageSpoke.xml",
+ "StorageSpoke_BootLoader.xml",
"WelcomeSpoke.xml",
"SummaryHub.xml",
"Installation_Guide.xml",