[system-administrators-guide] Adding section on Ethtool.
by stephenw
commit bd8c3d62141876c948c0021816d8a8791c6a1231
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Thu Dec 13 11:18:54 2012 +0100
Adding section on Ethtool.
en-US/Network_Interfaces.xml | 1069 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1069 insertions(+), 0 deletions(-)
---
diff --git a/en-US/Network_Interfaces.xml b/en-US/Network_Interfaces.xml
index cced4e5..4ee65c7 100644
--- a/en-US/Network_Interfaces.xml
+++ b/en-US/Network_Interfaces.xml
@@ -261,6 +261,7 @@ ONBOOT=yes</programlisting>
Changing speed or duplex settings almost always requires disabling autonegotiation with the <option>autoneg off</option> option. This option needs to be stated first, as the option entries are order-dependent.
</para>
</important>
+ <para>Refer to <xref linkend="s2-ethtool"/> for more Ethtool options.</para>
</listitem>
</varlistentry>
<!-- Suppress this directive as its better to put this in the Global Config file called /etc/sysconfig/network
@@ -521,6 +522,1074 @@ ONBOOT=yes</programlisting>
</variablelist>
</section>
+ <section id="s2-ethtool">
+ <title>Ethtool</title>
+ <indexterm>
+ <primary>network</primary>
+ <secondary>interfaces</secondary>
+ <tertiary>ethtool</tertiary>
+ </indexterm>
+ <para>Ethtool is a utility for configuration of <firstterm>Network Interface Cards</firstterm> (<acronym>NICs</acronym>). This utility allows querying and changing settings such as speed, port, auto-negotiation, PCI locations and checksum offload on many network devices, especially Ethernet devices.
+</para>
+
+<para>We present here a short selection of often used Ethtool commands together with some useful commands that are not well known. For a full list of commands type <command>ethtool -h</command> or refer to the man page, <filename>ethtool(8)</filename>, for a more verbose list and explanation. The first two examples are information queries and show the use of the different formats of the command.</para> <para>But first, the command structure:</para>
+
+<variablelist>
+
+
+
+ <synopsis><command>ethtool</command> <optional><replaceable>option</replaceable>...</optional> <replaceable>devname</replaceable></synopsis>
+<para>
+ where <replaceable>option</replaceable> is none or more options, and <replaceable>devname</replaceable> is your Network Interface Card (NIC). For example <interface>eth0</interface> or <interface>em1</interface>.</para>
+
+<varlistentry>
+<term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>command</secondary>
+ <tertiary>
+ <option>devname</option>
+ </tertiary>
+ </indexterm>
+ <command>ethtool</command>
+ </term>
+ <listitem>
+ <para>
+ The <command>ethtool</command> command with only a device name as an option is used to query a network device for NIC and driver statistics. It takes the following form:
+ </para>
+ <screen>ethtool <option>-S</option>, <option>--statistics</option> <replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>devname</replaceable> is your NIC. For example <interface>eth0</interface> or <interface>em1</interface>.
+ </para>
+ </listitem>
+
+ </varlistentry>
+
+</variablelist>
+ <para>
+ Some values can only be obtained when the command is run as root. Here is an example of the output when the command is run as root:
+ </para>
+ <screen>
+~]# <command>ethtool em1</command>
+Settings for em1:
+ Supported ports: [ TP ]
+ Supported link modes: 10baseT/Half 10baseT/Full
+ 100baseT/Half 100baseT/Full
+ 1000baseT/Full
+ Supported pause frame use: No
+ Supports auto-negotiation: Yes
+ Advertised link modes: 10baseT/Half 10baseT/Full
+ 100baseT/Half 100baseT/Full
+ 1000baseT/Full
+ Advertised pause frame use: No
+ Advertised auto-negotiation: Yes
+ Speed: 1000Mb/s
+ Duplex: Full
+ Port: Twisted Pair
+ PHYAD: 2
+ Transceiver: internal
+ Auto-negotiation: on
+ MDI-X: on
+ Supports Wake-on: pumbg
+ Wake-on: g
+ Current message level: 0x00000007 (7)
+ drv probe link
+ Link detected: yes
+ </screen>
+
+
+<para>
+ Issue the following command, using the short or long form of the argument, to query the specified network device for associated driver information:
+</para>
+<para><screen>
+<command>ethtool</command> <option>-i, --driver</option> <replaceable>devname</replaceable></screen>
+</para>
+
+ <para>
+ where <replaceable>devname</replaceable> is your Network Interface Card (NIC). For example <interface>eth0</interface> or <interface>em1</interface>.
+ </para>
+
+
+
+ <para>
+ Here is an example of the output:</para>
+
+ <screen>
+~]$ <command>ethtool -i em1</command>
+driver: e1000e
+version: 2.0.0-k
+firmware-version: 0.13-3
+bus-info: 0000:00:19.0
+supports-statistics: yes
+supports-test: yes
+supports-eeprom-access: yes
+supports-register-dump: yes </screen>
+
+
+
+
+
+<para>Here follows a list of commands to query, identify or reset the device. They are in the usual -short and --long form:</para>
+
+
+
+<variablelist>
+
+
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--statistics</option>
+ </tertiary>
+ </indexterm>
+ <option>--statistics</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--statistics</option> or <option>-S</option> queries the specified network device for NIC and driver statistics. It takes the following form:
+ </para>
+ <screen>ethtool <option>-S</option>, <option>--statistics</option> <replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>devname</replaceable> is your NIC.
+ </para>
+
+ </listitem>
+</varlistentry>
+
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--identify</option>
+ </tertiary>
+ </indexterm>
+ <option>--identify</option>
+ </term>
+ <listitem>
+ <para>
+The <option>--identify</option> or <option>-p</option> option initiates adapter-specific action intended to enable an operator to easily identify the adapter by sight. Typically this involves blinking one or more LEDs on the specified network port. It takes the following form:
+ </para>
+<screen><option>-p, --identify
+</option><replaceable>devname</replaceable> <replaceable>integer</replaceable></screen>
+ <para>
+ where <replaceable>integer</replaceable> is length of time in seconds to perform the action,
+ </para>
+
+ <para>
+ and <replaceable>devname</replaceable> is your NIC.
+ </para>
+
+ </listitem>
+</varlistentry>
+
+<varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--test</option>
+ </tertiary>
+ </indexterm>
+ <option>--test</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--test</option> or <option>-t</option> option is used to perform tests on a Network Interface Card. It takes the following form:
+ </para>
+<screen><option>-t, --test</option> <replaceable>word </replaceable><replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>word</replaceable> is one of the following:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>offline</literal> — Perform a comprehensive set of tests. Service will be interrupted.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>online</literal> — Perform a reduced set of tests. Service should not be interrupted.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>external_lb</literal> — Perform full set of tests including loopback tests while fitted with a loopback cable.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+
+
+ </listitem>
+</varlistentry>
+
+
+</variablelist>
+
+<para>Changing some or all settings of the specified network device requires the <option>-s</option> or <option>--change</option> option. All the following options are only applied if the <option>-s</option> or <option>--change</option> option is also specified. For the sake of clarity we will omit it here.
+ </para>
+ <para>
+ To make these settings permanent you can make use of the ETHTOOL_OPTS directive. It can be used in interface configuration files to set the desired options when the network interface is brought up. Refer to <xref linkend="s2-networkscripts-interfaces-eth0"/> for more details on how to use this directive.
+ </para>
+
+<variablelist>
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--speed</option>
+ </tertiary>
+ </indexterm>
+ <option>--speed</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--speed</option> option is used to set the speed in megabits per second (Mb/s). Omitting the speed value will show the supported device speeds. It takes the following form:
+ </para>
+ <screen>
+<option>--speed</option> <replaceable>number</replaceable> <replaceable>devname</replaceable></screen>
+
+
+ <para>
+ where <replaceable>number</replaceable> is the speed in megabits per second (Mb/s),
+ </para>
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+
+ </listitem>
+ </varlistentry>
+
+
+
+
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--duplex</option>
+ </tertiary>
+ </indexterm>
+ <option>--duplex</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--duplex</option> option is used to set the transmit and receive mode of operation. It takes the following form:
+ </para>
+ <screen>
+ <option>--duplex</option> <replaceable>word</replaceable> <replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>word</replaceable> is one of the following:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>half</literal> — Sets half-duplex mode. Usually used when connected to a hub.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>full</literal> — Sets full-duplex mode. Usually used when connected to a switch or another host.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+
+
+
+ </listitem>
+</varlistentry>
+
+
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--port</option>
+ </tertiary>
+ </indexterm>
+ <option>--port</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--port</option> option is used to select the device port . It takes the following form:
+ </para>
+ <screen><option>--port</option> <replaceable>value</replaceable> <replaceable>devname</replaceable></screen>
+
+
+ <para>
+ where <replaceable>value</replaceable> is one of the following:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>tp</literal> — An Ethernet interface using Twisted-Pair cable as the medium.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>aui</literal> — Attachment Unit Interface (AUI). Normally used with hubs.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>bnc</literal> — An Ethernet interface using BNC connectors and co-axial cable.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>mii</literal> — An Ethernet interface using a Media Independent Interface (MII).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>fibre</literal> — An Ethernet interface using Optical Fibre as the medium.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+
+ </listitem>
+
+</varlistentry>
+
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--autoneg</option>
+ </tertiary>
+ </indexterm>
+ <option>--autoneg</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--autoneg</option> option is used to control auto-negotiation of network speed and mode of operation (full-duplex or half-duplex mode). If auto-negotiation is enabled you can initiate re-negotiation of network speeds and mode of operation by using the <option>-r, --negotiate</option> option.
+ You can display the auto-negotiation state using the <option>--a, --show-pause</option> option.
+ </para>
+ <para>
+ It takes the following form:
+ </para>
+<screen><option>--autoneg</option> <replaceable>value</replaceable> <replaceable>devname</replaceable></screen>
+
+
+ <para>
+ where <replaceable>value</replaceable> is one of the following:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>yes</literal> — Allow auto-negotiating of network speed and mode of operation.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>no</literal> — Do not allow auto-negotiating of network speed and mode of operation.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+
+
+ </listitem>
+</varlistentry>
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--advertise</option>
+ </tertiary>
+ </indexterm>
+ <option>--advertise</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--advertise</option> option is used to set what speeds and modes of operation (duplex mode) are advertised for auto-negotiation. The argument is one or more hexadecimal values from <xref linkend="advertised-speeds-duplex-mode"/>.
+ </para>
+
+ <para>
+ It takes the following form:
+ </para>
+<screen><option>--advertise</option> <replaceable>HEX-VALUE</replaceable> <replaceable>devname</replaceable></screen>
+
+
+ <para>
+ where <replaceable>HEX-VALUE</replaceable> is one or more of the hexadecimal values from the table below and <replaceable>devname</replaceable> is your NIC.</para>
+
+
+
+ <table id="advertised-speeds-duplex-mode" frame="all">
+ <title>Ethtool advertise options: speed and mode of operation</title>
+ <tgroup cols="4" align="left" colsep="1" rowsep="1">
+ <colspec colnum="1" colname="col1"/>
+ <colspec colnum="2" colname="col2"/>
+ <colspec colnum="3" colname="col3"/>
+ <colspec colnum="4" colname="col4"/>
+ <thead>
+ <row>
+ <entry>
+ Hex Value
+ </entry>
+ <entry>
+ Speed
+ </entry>
+ <entry>
+ Duplex Mode
+ </entry>
+ <entry>
+ IEEE standard?
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ 0x001
+ </entry>
+ <entry>
+ 10
+ </entry>
+ <entry>
+ <para>
+ Half
+ </para>
+ </entry>
+ <entry>
+Yes
+</entry>
+ </row>
+ <row>
+ <entry>
+0x002
+</entry>
+ <entry>
+10
+</entry>
+ <entry>
+ <para>
+ Full
+ </para>
+ </entry>
+ <entry>
+ Yes
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x004
+ </entry>
+ <entry>
+ 100</entry>
+ <entry>
+ <para>
+ Half
+ </para>
+ </entry>
+ <entry>
+ Yes
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x008
+ </entry>
+ <entry>
+ 100
+ </entry>
+ <entry>
+ <para>
+ Full
+ </para>
+ </entry>
+ <entry>
+ Yes
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x010
+ </entry>
+ <entry>
+ 1000
+ </entry>
+ <entry>
+ Half
+ </entry>
+ <entry>
+ No
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x020
+ </entry>
+ <entry>
+ 1000
+ </entry>
+ <entry>
+ <para>
+ Full
+ </para>
+ </entry>
+ <entry>
+Yes</entry>
+ </row>
+ <row>
+ <entry>
+ 0x8000
+ </entry>
+ <entry>
+ 2500
+ </entry>
+ <entry>
+ Full
+ </entry>
+ <entry>
+ Yes
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x1000
+ </entry>
+ <entry>
+ 10000
+ </entry>
+ <entry>
+ Full
+ </entry>
+ <entry>
+ Yes
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x20000
+ </entry>
+ <entry>
+ 20000MLD2
+ </entry>
+ <entry>
+ Full
+ </entry>
+ <entry>
+ No
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x20000
+ </entry>
+ <entry>
+ 20000MLD2
+ </entry>
+ <entry>
+ Full
+ </entry>
+ <entry>
+ No
+ </entry>
+ </row>
+ <row>
+ <entry>
+ 0x40000
+ </entry>
+ <entry>
+ 20000KR2
+ </entry>
+ <entry>
+ Full
+ </entry>
+ <entry>
+ No
+ </entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+</listitem>
+</varlistentry>
+
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--phyad</option>
+ </tertiary>
+ </indexterm>
+ <option>--phyad</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--phyad</option> option is used to change the physical address. Often referred to as the MAC or hardware address but in this context referred to as the physical address.
+ </para>
+
+ <para>
+ It takes the following form:
+ </para>
+ <screen><option>--phyad</option> <replaceable>HEX-VALUE</replaceable> <replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>HEX-VALUE</replaceable> is the physical address in hexadecimal format and <replaceable>devname</replaceable> is your NIC.
+ </para>
+
+ </listitem>
+
+ </varlistentry>
+
+
+<varlistentry>
+<term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--xcvr</option>
+ </tertiary>
+ </indexterm>
+ <option>--xcvr</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--xcvr</option> option is used to select the transceiver type. Currently only <quote>internal</quote> and <quote>external</quote> can be specified. In the future other types might be added.
+ </para>
+
+ <para>
+ It takes the following form:
+ </para>
+ <screen><option>--xcvr</option> <replaceable>word</replaceable> <replaceable>devname</replaceable></screen>
+ <para>
+ where <replaceable>word</replaceable> is one of the following:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>internal</literal> — Use internal transceiver.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>external</literal> — Use external transceiver.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+</listitem>
+</varlistentry>
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--wol</option>
+ </tertiary>
+ </indexterm>
+ <option>--wol</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--wol</option> option is used to set <quote>Wake-on-LAN</quote> options. Not all devices support this. The argument to this option is a string of characters specifying which options to enable.
+</para>
+ <para>
+ It takes the following form:
+ </para>
+<screen><option>--wol</option> <replaceable>value</replaceable> <replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>value</replaceable> is one or more of the following:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>p</literal> — Wake on PHY activity.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>u</literal> — Wake on unicast messages.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>m</literal> — Wake on multicast messages.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>b</literal> — Wake on broadcast messages.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>g</literal> — Wake-on-Lan; wake on receipt of a "magic packet".
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>s</literal> — Enable security function using password for Wake-on-Lan.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>d</literal> — Disable Wake-on-Lan and clear all settings.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+
+</listitem>
+</varlistentry>
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--sopass</option>
+ </tertiary>
+ </indexterm>
+ <option>--sopass</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--sopass</option> option is used to set the <quote>SecureOn</quote> password. The argument to this option must be 6 bytes in Ethernet MAC hexadecimal format (xx:yy:zz:aa:bb:cc).
+ </para>
+
+ <para>
+ It takes the following form:
+ </para>
+ <screen><option>--sopass</option> <replaceable>xx:yy:zz:aa:bb:cc</replaceable> <replaceable>devname</replaceable></screen>
+
+ <para>
+ where <replaceable>xx:yy:zz:aa:bb:cc</replaceable> is the password in the same format as a MAC address and <replaceable>devname</replaceable> is your NIC.
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <indexterm>
+ <primary>
+ <application>Ethtool</application>
+ </primary>
+ <secondary>option</secondary>
+ <tertiary>
+ <option>--msglvl</option>
+ </tertiary>
+ </indexterm>
+ <option>--msglvl</option>
+ </term>
+ <listitem>
+ <para>
+ The <option>--msglvl</option> option is used to set the driver message-type flags by name or number. The precise meanings of these type flags differ between drivers.
+ </para>
+
+ <para>
+ It takes the following form:
+ </para>
+ <screen><option>--msglvl</option> <replaceable>value</replaceable> <replaceable>devname</replaceable></screen>
+
+
+ <para>
+ where <replaceable>value</replaceable> is one of:
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>HEX-VALUE</literal> — Hexadecimal value indicating message type.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>message-type</literal> — The message type name in plain text.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para> and <replaceable>devname</replaceable> is your NIC.</para>
+<para>
+ The defined message type names and numbers are shown in the table below:
+ </para>
+
+ <table id="msglvl-driver-message-type" frame="all">
+ <title>Driver message type</title>
+ <tgroup cols="3" align="left" colsep="1" rowsep="1">
+ <colspec colnum="1" colname="col1"/>
+ <colspec colnum="2" colname="col2"/>
+ <colspec colnum="3" colname="col3"/>
+
+ <thead>
+ <row>
+ <entry>
+ Message Type
+ </entry>
+ <entry>
+ Hex Value
+ </entry>
+ <entry>
+ Description
+ </entry>
+
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ drv
+ </entry>
+ <entry>
+ 0x0001
+ </entry>
+ <entry>
+ <para>
+ General driver status
+ </para>
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+probe
+
+</entry>
+ <entry>
+0x0002
+</entry>
+ <entry>
+ <para>
+ Hardware probing
+ </para>
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ link
+ </entry>
+ <entry>
+ 0x0004
+ </entry>
+ <entry>
+ <para>
+ Link state
+ </para>
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ timer
+ </entry>
+ <entry>
+ 0x0008
+ </entry>
+ <entry>
+ <para>
+ Periodic status check
+ </para>
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ ifdown
+ </entry>
+ <entry>
+ 0x0010
+ </entry>
+ <entry>
+Interface being brought down
+</entry>
+
+ </row>
+ <row>
+ <entry>
+ ifup
+ </entry>
+ <entry>
+ 0x0020
+ </entry>
+ <entry>
+ <para>
+ Interface being brought up
+ </para>
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ rx_err
+ </entry>
+ <entry>
+ 0x0040
+ </entry>
+ <entry>
+ Receive error
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ tx_err
+ </entry>
+ <entry>
+ 0x0080
+ </entry>
+ <entry>
+ Transmit error
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ intr
+ </entry>
+ <entry>
+ 0x0200
+ </entry>
+ <entry>
+ Interrupt handling
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ tx_done
+ </entry>
+ <entry>
+ 0x0400
+ </entry>
+ <entry>
+ Transmit completion
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ rx_status
+ </entry>
+ <entry>
+ 0x0800
+ </entry>
+ <entry>
+ Receive completion
+ </entry>
+
+ </row>
+ <row>
+ <entry>
+ pktdata
+ </entry>
+ <entry>
+ 0x1000
+ </entry>
+ <entry>
+ Packet contents
+ </entry>
+ </row>
+ <row>
+ <entry>
+ hw
+ </entry>
+ <entry>
+ 0x2000
+ </entry>
+ <entry>
+ Hardware status
+ </entry>
+ </row>
+ <row>
+ <entry>
+wol
+ </entry>
+ <entry>
+0x4000
+</entry>
+ <entry>
+ Wake-on-LAN status
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ </listitem>
+
+</varlistentry>
+
+</variablelist>
+</section>
+
<section id="s2-networkscripts-interfaces-chan">
<title>Channel Bonding Interfaces</title>
<indexterm>
11 years, 4 months
[system-administrators-guide] Appendix A: Consistent Network Device Naming | Removing parts which no longer apply.
by stephenw
commit 31b0ca5ccfae3fa0f0b032d3055be3ec09c233f6
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Thu Dec 13 11:12:09 2012 +0100
Appendix A: Consistent Network Device Naming | Removing parts which no longer apply.
based on e-mail from Kay Sievers
"..udev will no longer try to rename network devices by default <snip>
biosdevname should be used by default."
Date: Tue, 11 Sep 2012 11:25:59 -0400 (EDT)
From: Kay Sievers
To: Stephen Wadeley
Cc: Harald Hoyer
en-US/Consistent_Network_Device_Naming.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/en-US/Consistent_Network_Device_Naming.xml b/en-US/Consistent_Network_Device_Naming.xml
index 4ccd7d3..e9de1cf 100644
--- a/en-US/Consistent_Network_Device_Naming.xml
+++ b/en-US/Consistent_Network_Device_Naming.xml
@@ -71,10 +71,11 @@
</tbody>
</tgroup>
</table>
+ <!-- No longer applies in Fedora 17
<para>
System administrators may continue to write rules in <filename>/etc/udev/rules.d/70-persistent-net.rules</filename> to change the device names to anything desired; those will take precedence over this physical location naming convention.
</para>
- <section id="sect-Consistent_Network_Device_Naming-Affected_Systems">
+ <section id="sect-Consistent_Network_Device_Naming-Affected_Systems">
<title>Affected Systems</title>
<para>
Consistent network device naming is enabled by default for all systems that meet the requirements in <xref linkend="sect-Consistent_Network_Device_Naming-System_Requirements" />.
@@ -83,6 +84,7 @@
Regardless of the type of system, Fedora guests will not have devices renamed unless the virtual machine BIOS provides the SMBIOS information outlined in <xref linkend="sect-Consistent_Network_Device_Naming-System_Requirements" />. Also, upgrades from prior releases that did not use this naming convention (that is, Fedora 14 and older) are unaffected, and the old naming convention will continue to be used.
</para>
</section>
+ -->
<section id="sect-Consistent_Network_Device_Naming-System_Requirements">
<title>System Requirements</title>
<para>
@@ -114,8 +116,10 @@
<para>
Many system customization files can include network interface names, and thus will require updates if moving a system from the old convention to the new convention. If you use the new naming convention, you will also need to update network interface names in areas such as custom iptables rules, scripts altering irqbalance, and other similar configuration files. Also, enabling this change for installation will require modification to existing kickstart files that use device names via the <option>ksdevice</option> parameter; these kickstart files will need to be updated to use the network device's MAC address or the network device's new name.
</para>
+ <!-- No longer applies in Fedora 17
<para>
&OSORG; strongly recommends that you consider this feature to be an install-time choice; enabling or disabling the feature post-install, while technically possible, can be complicated and is not recommended. For those system administrators who wish to do so, on a system that meets the minimum requirements, remove the <filename>/etc/udev/rules.d/70-persistent-net.rules</filename> file and the <option>HWADDR</option> lines from all <filename>/etc/sysconfig/network-scripts/ifcfg-*</filename> files. In addition, rename those <filename>ifcfg-*</filename> files to use this new naming convention. The new names will be in effect after reboot. Remember to update any custom scripts, iptables rules, and service configuration files that might include network interface names.
</para>
+ -->
</section>
</appendix>
11 years, 4 months
[install-guide] Adding path descriptions to 'Storage and Partitioning' to account for 'Reclaim Space' tool
by Jack Reed
commit 82c80620d6b32cdb53c64776dbea16f837e178e6
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Dec 13 16:00:48 2012 +1000
Adding path descriptions to 'Storage and Partitioning' to account for 'Reclaim Space' tool
...utomatic_Partitioning_common-itemizedlist-1.xml | 25 ++++++++++++++++
...utomatic_Partitioning_common-itemizedlist-2.xml | 30 ++++++++++++++++++++
...utomatic_Partitioning_common-itemizedlist-3.xml | 25 ++++++++++++++++
en-US/Automatic_Partitioning_common-list-1.xml | 4 +-
en-US/Automatic_Partitioning_common-para-10.xml | 9 ++++++
en-US/Automatic_Partitioning_common-para-11.xml | 9 ++++++
en-US/Automatic_Partitioning_common-para-4.xml | 2 +-
en-US/Automatic_Partitioning_common-para-7.xml | 2 +-
en-US/Automatic_Partitioning_common-para-8.xml | 2 +-
en-US/Disk_Partitioning_Setup-x86.xml | 15 ++++++---
10 files changed, 113 insertions(+), 10 deletions(-)
---
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-1.xml b/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
new file mode 100644
index 0000000..85427ee
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-1.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry 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;
+]>
+<itemizedlist>
+ <listitem>
+ <para>
+ click <guibutton>Cancel & add more disks</guibutton> if you would like to add more storage space
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ click <guibutton>Continue</guibutton> to allow Fedora to automatically configure the partitions for you and return to the Installation Hub
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ check the box labeled <guilabel>Let me customize the partitioning of the disks</guilabel> if you want to create and edit the partitions yourself, then click <guibutton>Continue</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section (refer to <xref linkend="s1-diskpartitioning-x86" />)
+ </para>
+ </listitem>
+</itemizedlist>
+
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-2.xml b/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
new file mode 100644
index 0000000..07394d8
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-2.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry 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;
+]>
+<itemizedlist>
+ <listitem>
+ <para>
+ click <guibutton>Cancel & add more disks</guibutton> if you would like to add more storage space
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ click <guibutton>Modify Software Selection</guibutton> to reduce the number of packages to be installed, which may free enough space for the installation to proceed
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ click <guibutton>Reclaim space</guibutton> to choose how to reassign space from other filesystems to this installation
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ check the box labeled <guilabel>Let me customize the partitioning of the disks</guilabel> to edit the existing filesystems manually and click <guibutton>Continue</guibutton> to reach the <guilabel>Manual Partitioning</guilabel> section (refer to <xref linkend="s1-diskpartitioning-x86" />)
+ </para>
+ </listitem>
+</itemizedlist>
\ No newline at end of file
diff --git a/en-US/Automatic_Partitioning_common-itemizedlist-3.xml b/en-US/Automatic_Partitioning_common-itemizedlist-3.xml
new file mode 100644
index 0000000..58e686b
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-itemizedlist-3.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE varlistentry 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;
+]>
+<itemizedlist>
+ <listitem>
+ <para>
+ Free space available for use
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Free space unavailable but reclaimable from existing partitions
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Space in selected disks reclaimable by deleting existing partitions
+ </para>
+ </listitem>
+</itemizedlist>
+
diff --git a/en-US/Automatic_Partitioning_common-list-1.xml b/en-US/Automatic_Partitioning_common-list-1.xml
index 2f1ef07..f4bdced 100644
--- a/en-US/Automatic_Partitioning_common-list-1.xml
+++ b/en-US/Automatic_Partitioning_common-list-1.xml
@@ -11,12 +11,12 @@
</listitem>
<listitem>
<para>
- <guilabel>BTRFS</guilabel> (B-Tree File System, as described in <xref linkend="s3-diskpartitioning-file-x86" />
+ <guilabel>BTRFS</guilabel> (B-Tree File System, as described in <xref linkend="s3-diskpartitioning-file-x86" />)
</para>
</listitem>
<listitem>
<para>
- <guilabel>LVM</guilabel> (Logical Volume Management, as described in <xref linkend="sn-partitioning-lvm" />
+ <guilabel>LVM</guilabel> (Logical Volume Management, as described in <xref linkend="sn-partitioning-lvm" />)
</para>
</listitem>
</itemizedlist>
diff --git a/en-US/Automatic_Partitioning_common-para-10.xml b/en-US/Automatic_Partitioning_common-para-10.xml
new file mode 100644
index 0000000..74c4051
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-para-10.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ Whichever path you choose whether you have sufficient or insufficient space, you will be prompted to create a passphrase when you click <guibutton>Continue</guibutton> if you chose to encrypt your data (refer to <xref linkend="encrypt-x86" />).
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-11.xml b/en-US/Automatic_Partitioning_common-para-11.xml
new file mode 100644
index 0000000..2610808
--- /dev/null
+++ b/en-US/Automatic_Partitioning_common-para-11.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ Choose from the following paths to generate sufficient space to install Fedora:
+</para>
+
diff --git a/en-US/Automatic_Partitioning_common-para-4.xml b/en-US/Automatic_Partitioning_common-para-4.xml
index 67f8de2..6d467d2 100644
--- a/en-US/Automatic_Partitioning_common-para-4.xml
+++ b/en-US/Automatic_Partitioning_common-para-4.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Click <guilabel>Partition Scheme Configuration</guilabel> to choose a partitioning scheme. This will apply to both automated and manually-generated partitions, although individual partitions can later be modified during the manual partitioning process. Choose from:
+ Optionally, click <guilabel>Partition Scheme Configuration</guilabel> in the <guilabel>Installation Options</guilabel> dialog to choose a partitioning scheme (the default is LVM). This will apply to both automated and manually-generated partitions, although individual partitions can later be modified during the manual partitioning process. Choose from:
</para>
diff --git a/en-US/Automatic_Partitioning_common-para-7.xml b/en-US/Automatic_Partitioning_common-para-7.xml
index b388bc6..9b79fc0 100644
--- a/en-US/Automatic_Partitioning_common-para-7.xml
+++ b/en-US/Automatic_Partitioning_common-para-7.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- To partition the drive manually, check the box labeled <guilabel>Let me customize the partitioning of the disks instead</guilabel>.
+ If there is sufficient space to install Fedora, choose from the following paths:
</para>
diff --git a/en-US/Automatic_Partitioning_common-para-8.xml b/en-US/Automatic_Partitioning_common-para-8.xml
index 55536a6..93cae55 100644
--- a/en-US/Automatic_Partitioning_common-para-8.xml
+++ b/en-US/Automatic_Partitioning_common-para-8.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Click <guibutton>Continue</guibutton> to proceed. If you chose to encrypt the partitions, you will now be prompted to create a passphrase (refer to <xref linkend="encrypt-x86" />. If you chose to partition the disks manually, you will be directed to <guilabel>Manual Partitioning</guilabel>, which is addressed in <xref linkend="s1-diskpartitioning-x86" />. If you chose automatic partitioning, you will be returned to the Installation Hub.
+ If there is not enough space and there are existing filesystems on the selected disk, you will be informed how much space could be reclaimed by shrinking or deleting these filesystems. The potential space is presented in three categories:
</para>
diff --git a/en-US/Disk_Partitioning_Setup-x86.xml b/en-US/Disk_Partitioning_Setup-x86.xml
index e188f9f..bcc5474 100644
--- a/en-US/Disk_Partitioning_Setup-x86.xml
+++ b/en-US/Disk_Partitioning_Setup-x86.xml
@@ -37,13 +37,18 @@
<!-- To encrypt all partitions except the /boot partition... --> <xi:include href="Automatic_Partitioning_common-para-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Click Continue once you have made your selections... --> <xi:include href="Automatic_Partitioning_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- The Installation Options dialog now appears... --> <xi:include href="Disk_Partitioning_Setup_common-figure-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose automatic partitioning or manual partitioning... --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If there is sufficient space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Click Cancel and add more disks... --> <xi:include href="Automatic_Partitioning_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If there is not enough space... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Free space available... --> <xi:include href="Automatic_Partitioning_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Choose from the following paths... --> <xi:include href="Automatic_Partitioning_common-itemizedlist-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Click Cancel and add more disks... --> <xi:include href="Automatic_Partitioning_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Whichever path you choose... --> <xi:include href="Automatic_Partitioning_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Click Partition Scheme Configuration to choose... --> <xi:include href="Automatic_Partitioning_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Standard Partition... --> <xi:include href="Automatic_Partitioning_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- To partition the drive manually... --> <xi:include href="Disk_Partitioning_Setup_common-important-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Standard Partition... --> <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... -->
+ <!-- Important - multipath and non-multipath... -->
<xi:include href="X86_Bootloader.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
11 years, 4 months
[install-guide] Added 'Reclaim disk space' section
by Jack Reed
commit 1e5af4d8e5469b0c7c91b139c042285a56763818
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Dec 13 15:04:51 2012 +1000
Added 'Reclaim disk space' section
en-US/Graphical_Installation-x86.xml | 3 ++-
en-US/Reclaim_Space-x86.xml | 18 ++++++++++++++++++
en-US/Reclaim_Space_common-figure-1.xml | 21 +++++++++++++++++++++
en-US/Reclaim_Space_common-para-1.xml | 9 +++++++++
en-US/Reclaim_Space_common-para-2.xml | 9 +++++++++
en-US/Reclaim_Space_common-para-3.xml | 9 +++++++++
en-US/Reclaim_Space_common-para-4.xml | 9 +++++++++
en-US/Reclaim_Space_common-para-5.xml | 9 +++++++++
en-US/Reclaim_Space_common-title-1.xml | 7 +++++++
en-US/Reclaim_Space_itemized-list-1.xml | 26 ++++++++++++++++++++++++++
en-US/images/diskpartsetup/reclaim-space.png | Bin 0 -> 45981 bytes
11 files changed, 119 insertions(+), 1 deletions(-)
---
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index a202427..1a50284 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -157,7 +157,8 @@
<!-- Initializing Hard Disk --> <!-- <xi:include href="Upgrading-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<!-- The installation system automatically detects any existing... --> <xi:include href="Disk_Partitioning_Setup-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Disk Partitioning Setup --> <xi:include href="Encrypt-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Disk Encryption --> <xi:include href="Disk_Partitioning-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Disk Encryption --> <xi:include href="Reclaim_Space-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Reclaim Disk Space --> <xi:include href="Disk_Partitioning-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Partitioning Your System
Graphical Display of Hard Drives
The partitioning screen
diff --git a/en-US/Reclaim_Space-x86.xml b/en-US/Reclaim_Space-x86.xml
new file mode 100644
index 0000000..e8709c4
--- /dev/null
+++ b/en-US/Reclaim_Space-x86.xml
@@ -0,0 +1,18 @@
+<?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="reclaim_space-x86">
+ <xi:include href="Reclaim_Space_common-title-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Reclaim space --> <xi:include href="Reclaim_Space_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- If there is insufficient space to install Fedora --> <xi:include href="Reclaim_Space_common-figure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Reclaim disk space from existing --> <xi:include href="Reclaim_Space_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The existing filesystems Fedora has detected --> <xi:include href="Reclaim_Space_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Beneath the table are three buttons: --> <xi:include href="Reclaim_Space_itemized-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Preserve; Shrink; Delete --> <xi:include href="Reclaim_Space_common-para-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Select a filesystem from the table with your mouse --> <xi:include href="Reclaim_Space_common-para-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- When enough space has been reclaimed for the installation -->
+</section>
+
+
diff --git a/en-US/Reclaim_Space_common-figure-1.xml b/en-US/Reclaim_Space_common-figure-1.xml
new file mode 100644
index 0000000..2b0fd17
--- /dev/null
+++ b/en-US/Reclaim_Space_common-figure-1.xml
@@ -0,0 +1,21 @@
+<?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;
+]>
+<figure>
+ <title>Reclaim disk space from existing filesystems</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/diskpartsetup/reclaim-space.png" format="PNG" width="444" />
+ </imageobject>
+ <textobject>
+ <para>
+ The dialog allows you to preserve, shrink, or delete existing filesystems to generate necessary space to install Fedora.
+ </para>
+
+ </textobject>
+
+ </mediaobject>
+</figure>
+
diff --git a/en-US/Reclaim_Space_common-para-1.xml b/en-US/Reclaim_Space_common-para-1.xml
new file mode 100644
index 0000000..7da06d7
--- /dev/null
+++ b/en-US/Reclaim_Space_common-para-1.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ If there is insufficient space to install Fedora on the disks selected in <guilabel>Installation Destination</guilabel> (refer to <xref linkend="s1-diskpartsetup-x86" />) and you selected <guibutton>Reclaim Space</guibutton> at the <guilabel>Installation Options</guilabel> dialog, you will be directed to the <guilabel>Reclaim Disk Space</guilabel> tool.
+</para>
+
diff --git a/en-US/Reclaim_Space_common-para-2.xml b/en-US/Reclaim_Space_common-para-2.xml
new file mode 100644
index 0000000..725960c
--- /dev/null
+++ b/en-US/Reclaim_Space_common-para-2.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ The existing filesystems Fedora has detected will be listed in a table as part of their respective disk. The <guilabel>Reclaimable Space</guilabel> column lists the space that could be reassigned to this installation. The <guilabel>Action</guilabel> column lists what action will be taken with the filesystem to reclaim space.
+</para>
+
diff --git a/en-US/Reclaim_Space_common-para-3.xml b/en-US/Reclaim_Space_common-para-3.xml
new file mode 100644
index 0000000..079df1b
--- /dev/null
+++ b/en-US/Reclaim_Space_common-para-3.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ Beneath the table are three buttons:
+</para>
+
diff --git a/en-US/Reclaim_Space_common-para-4.xml b/en-US/Reclaim_Space_common-para-4.xml
new file mode 100644
index 0000000..81aae6e
--- /dev/null
+++ b/en-US/Reclaim_Space_common-para-4.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ Select a filesystem from the table with your mouse and click <guibutton>Preserve</guibutton>, <guibutton>Shrink</guibutton>, or <guibutton>Delete</guibutton>. The label in the <guilabel>Action</guilabel> column will change to match your selection and the amount of <guilabel>Total selected space to reclaim</guilabel> displayed beneath the table will increase or decrease in response. Beneath this value is the amount of space the installation requires based on the packages you have selected to install (refer to <xref linkend="s1-pkgselection-x86" />).
+</para>
+
diff --git a/en-US/Reclaim_Space_common-para-5.xml b/en-US/Reclaim_Space_common-para-5.xml
new file mode 100644
index 0000000..bd9f17b
--- /dev/null
+++ b/en-US/Reclaim_Space_common-para-5.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ When enough space has been reclaimed for the installation to proceed, the <guibutton>Reclaim Space</guibutton> button will become available. Click this button to return to the Installation Hub and proceed with the installation.
+</para>
+
diff --git a/en-US/Reclaim_Space_common-title-1.xml b/en-US/Reclaim_Space_common-title-1.xml
new file mode 100644
index 0000000..6e57471
--- /dev/null
+++ b/en-US/Reclaim_Space_common-title-1.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE title 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;
+]>
+<title>Reclaim disk space</title>
+
diff --git a/en-US/Reclaim_Space_itemized-list-1.xml b/en-US/Reclaim_Space_itemized-list-1.xml
new file mode 100644
index 0000000..d6c823d
--- /dev/null
+++ b/en-US/Reclaim_Space_itemized-list-1.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <guibutton>Preserve</guibutton>: leaves the filesystem intact and no data is deleted (this is the default action).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <guibutton>Shrink</guibutton>: recovers free space from the filesystem and makes it available for this installation.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <guibutton>Delete</guibutton>: removes the filesystem entirely. All the space it takes up on the disk will be made available for this installation.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
diff --git a/en-US/images/diskpartsetup/reclaim-space.png b/en-US/images/diskpartsetup/reclaim-space.png
new file mode 100644
index 0000000..c972477
Binary files /dev/null and b/en-US/images/diskpartsetup/reclaim-space.png differ
11 years, 4 months
[install-guide] Removing unclear or outdated BIOS Boot information
by Jack Reed
commit 793a954f1345c9e08fa3d2994e5474d320f6d3c1
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Dec 13 11:51:30 2012 +1000
Removing unclear or outdated BIOS Boot information
...titions-section-2-itemizedlist-1-listitem-9.xml | 2 +-
en-US/Advice_on_Partitions.xml | 27 --------------------
2 files changed, 1 insertions(+), 28 deletions(-)
---
diff --git a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-9.xml b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-9.xml
index dd9f762..96c1abe 100644
--- a/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-9.xml
+++ b/en-US/Adding_Partitions-section-2-itemizedlist-1-listitem-9.xml
@@ -5,7 +5,7 @@
]>
<listitem>
<para>
- <guilabel>BIOS Boot</guilabel> — A small partition requiring for booting a device with a GPT/GUID partition table, including disks that have been initialized by the installer.
+ <guilabel>BIOS Boot</guilabel> — A small partition requiring for booting a device with a GPT/GUID partition table.
</para>
</listitem>
diff --git a/en-US/Advice_on_Partitions.xml b/en-US/Advice_on_Partitions.xml
index 0e7d165..3658e11 100644
--- a/en-US/Advice_on_Partitions.xml
+++ b/en-US/Advice_on_Partitions.xml
@@ -63,33 +63,6 @@
</listitem>
<listitem>
- <para>
- If you are creating a custom partition layout on a non-EFI x86 system, you are strongly advised to create a separate, 1MB BIOS boot partition. This is only recommended on the disk you are installing the bootloader on and if any of the following conditions apply:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- The disk contains a GPT partition table.
- </para>
- </listitem>
- <listitem>
- <para>
- The installer has already initialized the disk for you.
- </para>
- </listitem>
- <listitem>
- <para>
- You selected <guilabel>Use All Space</guilabel> in the Disk Partitioning Setup.
- </para>
- </listitem>
- </itemizedlist>
-
- <para>
- This boot partition will be used by the GRUB boot loader for storage.
- </para>
- </listitem>
- <listitem>
<para>
Certain platforms have specific partitioning requirements:
</para>
11 years, 4 months
[install-guide] Minor corrections to Begin Installation section
by Jack Reed
commit dfdd11490e687511d911c95a3a6acfd51e7396da
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Dec 13 11:50:52 2012 +1000
Minor corrections to Begin Installation section
en-US/Write_changes_to_disk_common-para-1.xml | 2 +-
en-US/Write_changes_to_disk_x86-para-4.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/en-US/Write_changes_to_disk_common-para-1.xml b/en-US/Write_changes_to_disk_common-para-1.xml
index 3c7e8fd..e7e9cde 100644
--- a/en-US/Write_changes_to_disk_common-para-1.xml
+++ b/en-US/Write_changes_to_disk_common-para-1.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- When all required sections of the Installation Hub have been completed, the yellow admonition at the bottom of the Hub screen will disappear and the <guibutton>Begin Installation</guibutton> can be selected.
+ When all required sections of the Installation Hub have been completed, the yellow admonition at the bottom of the Hub screen will disappear and the <guibutton>Begin Installation</guibutton> button can be selected.
</para>
diff --git a/en-US/Write_changes_to_disk_x86-para-4.xml b/en-US/Write_changes_to_disk_x86-para-4.xml
index a626420..e875ae9 100644
--- a/en-US/Write_changes_to_disk_x86-para-4.xml
+++ b/en-US/Write_changes_to_disk_x86-para-4.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- To revise any of the choices that you made up to this point, click <guibutton>Go back</guibutton>. To cancel installation completely, switch off your computer. To switch off most computers at this stage, press the power button and hold it down for a few seconds.
+ To revise any of the choices that you made up to this point, return to the relevant section of the Installation Hub. To cancel installation completely, click <guibutton>Quit</guibutton> or switch off your computer. To switch off most computers at this stage, press the power button and hold it down for a few seconds.
</para>
11 years, 4 months
[install-guide] Removing admonition about installing bootloader on USB
by Jack Reed
commit 0c344dce19d47375258717d1651ff2ab07fa53d2
Author: Jack Reed <jreed(a)redhat.com>
Date: Thu Dec 13 11:50:06 2012 +1000
Removing admonition about installing bootloader on USB
en-US/X86_Bootloader.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index c632efb..b998164 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -242,12 +242,12 @@
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>
+ <!-- <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>
+ </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" />
11 years, 4 months
[install-guide] Minor partitioning and bootloader installation edits
by Jack Reed
commit 675f1900b470d1131e0a481e729f1d6ee978ab66
Author: Jack Reed <jreed(a)redhat.com>
Date: Wed Dec 12 16:29:47 2012 +1000
Minor partitioning and bootloader installation edits
en-US/Create_LVM-common-para-1.xml | 2 +-
en-US/Create_Software_RAID-common-para-2.xml | 2 +-
en-US/Create_Software_RAID-x86.xml | 4 ++--
...artitioning_Graphical_common-itemizedlist-1.xml | 2 +-
.../Disk_Partitioning_Setup_common-important-2.xml | 2 +-
en-US/X86_Bootloader.xml | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/en-US/Create_LVM-common-para-1.xml b/en-US/Create_LVM-common-para-1.xml
index 457ff2c..3f13556 100644
--- a/en-US/Create_LVM-common-para-1.xml
+++ b/en-US/Create_LVM-common-para-1.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- <firstterm>Logical Volume Management</firstterm> (LVM) presents a simple logical view of underlying physical storage space, such as a hard drives or LUNs. Partitions on physical storage are represented as <firstterm>physical volumes</firstterm> that can be grouped together into <firstterm>volume groups</firstterm>. Each volume group can be divided into multiple <firstterm>logical volumes</firstterm>, each of which is analogous to a standard disk partition. Therefore, LVM logical volumes function as partitions that can span multiple physical disks.
+ <firstterm>Logical Volume Management</firstterm> (LVM) presents a simple logical view of underlying physical storage space, such as hard drives or LUNs. Partitions on physical storage are represented as <firstterm>physical volumes</firstterm> that can be grouped together into <firstterm>volume groups</firstterm>. Each volume group can be divided into multiple <firstterm>logical volumes</firstterm>, each of which is analogous to a standard disk partition. Therefore, LVM logical volumes function as partitions that can span multiple physical disks.
</para>
diff --git a/en-US/Create_Software_RAID-common-para-2.xml b/en-US/Create_Software_RAID-common-para-2.xml
index 662c78d..b625893 100644
--- a/en-US/Create_Software_RAID-common-para-2.xml
+++ b/en-US/Create_Software_RAID-common-para-2.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- In earlier versions of Fedora, RAID partitions and devices were created in separate steps. Now, the RAID device is created in one step and disks are added or removed as necessary. RAID partitions are not individually created prior to this. One RAID partition is allowed per disk for each device, so the number of disks available to the installer will determine which levels of RAID device are available to you.
+ In earlier versions of Fedora, RAID partitions and devices were created in separate steps. Now, the RAID device is created in one step and disks are added or removed as necessary. One RAID partition is allowed per disk for each device, so the number of disks available to the installer will determine which levels of RAID device are available to you.
</para>
diff --git a/en-US/Create_Software_RAID-x86.xml b/en-US/Create_Software_RAID-x86.xml
index de77f3a..93fe62c 100644
--- a/en-US/Create_Software_RAID-x86.xml
+++ b/en-US/Create_Software_RAID-x86.xml
@@ -49,7 +49,7 @@
<step>
<para>
- A group of checkboxes will appear beneath the <guilabel>File System</guilabel> dropdown menu, which is grayed out for RAID. Choose the RAID level of the device by checking the appropriate boxes (refer to <xref linkend="RAID_Levels-x86" /> for information about RAID levels). Certain boxes may be grayed out and labeled <guilabel>not enough disks</guilabel> if that RAID level cannot be achieved with the available disks. The checkboxes required for each RAID level are:
+ A group of checkboxes will appear beneath the <guilabel>File System</guilabel> dropdown menu, which is grayed out for RAID. Choose the RAID level of the device by checking the appropriate boxes (refer to <xref linkend="RAID_Levels-x86" /> for more information). Certain boxes may be grayed out and labeled <guilabel>not enough disks</guilabel> if that RAID level cannot be achieved with the available disks. The checkboxes required for each RAID level are:
</para>
<itemizedlist>
<listitem>
@@ -86,7 +86,7 @@
</step>
<step>
<para>
- While keeping the partition selected in the left-hand pane, select the configuration button below the pane to choose which disks will be included in the RAID device.
+ Keeping the partition selected in the left-hand pane, select the configuration button below the pane to open the <guilabel>Configure Mount Point</guilabel> dialog. Select which disks will be included in the RAID device and click <guibutton>Select</guibutton>.
</para>
<para>
If fewer disks are included than the specified RAID level needs, a yellow notification bar at the bottom of the screen will inform you that <guilabel>Device reconfiguration failed</guilabel>. Clicking this warning prompts a dialog informing you how many disks are required.
diff --git a/en-US/Disk_Partitioning_Graphical_common-itemizedlist-1.xml b/en-US/Disk_Partitioning_Graphical_common-itemizedlist-1.xml
index b980bfb..2cba527 100644
--- a/en-US/Disk_Partitioning_Graphical_common-itemizedlist-1.xml
+++ b/en-US/Disk_Partitioning_Graphical_common-itemizedlist-1.xml
@@ -6,7 +6,7 @@
<itemizedlist>
<listitem>
<para>
- <guilabel>Name</guilabel>: Assign a name to the partition. Certain partitions will be named automatically when they are created and their name is unavailable for editing, such as a <filename>home</filename> being assigned the name <filename>sda1</filename>. Others can be named arbitrarily.
+ <guilabel>Name</guilabel>: Assign a name to the partition. Certain partitions will be named automatically when they are created and their name is unavailable for editing, such as <filename>/home</filename> being assigned the name <filename>sda1</filename>. Others can be named arbitrarily.
</para>
</listitem>
<listitem>
diff --git a/en-US/Disk_Partitioning_Setup_common-important-2.xml b/en-US/Disk_Partitioning_Setup_common-important-2.xml
index e22cb70..b9338b1 100644
--- a/en-US/Disk_Partitioning_Setup_common-important-2.xml
+++ b/en-US/Disk_Partitioning_Setup_common-important-2.xml
@@ -14,7 +14,7 @@
When you install Fedora on a system with multipath and non-multipath storage devices, the automatic partitioning layout in the installer might create volume groups that contain a mix of multipath and non-multipath devices. This defeats the purpose of multipath storage.
</para>
<para>
- We advise that you select only multipath or only non-multipath devices on the disk selection screen that appears after selecting automatic partitioning. Alternatively, select custom partitioning.
+ We advise that you select only multipath or only non-multipath devices on the <guilabel>Installation Destination</guilabel> screen. Alternatively, proceed to manual partitioning (refer to <xref linkend="s1-diskpartitioning-x86" />.
</para>
</important>
diff --git a/en-US/X86_Bootloader.xml b/en-US/X86_Bootloader.xml
index 70ec43a..c632efb 100644
--- a/en-US/X86_Bootloader.xml
+++ b/en-US/X86_Bootloader.xml
@@ -247,7 +247,7 @@
<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>
+ </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" />
11 years, 4 months
[install-guide] Minor edits to Time Zone Config section
by Jack Reed
commit 510e64d890d7f72fc57dc2e2dc556eeb26d14494
Author: Jack Reed <jreed(a)redhat.com>
Date: Wed Dec 12 16:02:46 2012 +1000
Minor edits to Time Zone Config section
en-US/Time_Zone_common-para-2.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/en-US/Time_Zone_common-para-2.xml b/en-US/Time_Zone_common-para-2.xml
index 2ca96d6..b2b3eb3 100644
--- a/en-US/Time_Zone_common-para-2.xml
+++ b/en-US/Time_Zone_common-para-2.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- From here there are two ways for you to select your time zone:
+ There are two ways for you to select your time zone:
</para>
11 years, 4 months
[install-guide] Intro para and minor edits for Software Selection section
by Jack Reed
commit 753460cf8ad8898b5fd0f68e107d61d0e7b1303b
Author: Jack Reed <jreed(a)redhat.com>
Date: Wed Dec 12 16:02:09 2012 +1000
Intro para and minor edits for Software Selection section
en-US/Package_Selection-x86.xml | 3 ++-
en-US/Package_Selection_common-list-1.xml | 2 +-
en-US/Package_Selection_common-para-12.xml | 8 ++++++++
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/en-US/Package_Selection-x86.xml b/en-US/Package_Selection-x86.xml
index 6354dd3..4a62f58 100644
--- a/en-US/Package_Selection-x86.xml
+++ b/en-US/Package_Selection-x86.xml
@@ -28,7 +28,8 @@
</mediaobject>
</figure>
- <xi:include href="Package_Selection_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Package_Selection_common-para-12.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- To specify which packages Fedora will... --> <xi:include href="Package_Selection_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- By default, Fedora installs the GNOME... --> <xi:include href="Package_Selection_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Graphical Desktops
GNOME Desktop
diff --git a/en-US/Package_Selection_common-list-1.xml b/en-US/Package_Selection_common-list-1.xml
index acee6e6..27a4c78 100644
--- a/en-US/Package_Selection_common-list-1.xml
+++ b/en-US/Package_Selection_common-list-1.xml
@@ -24,7 +24,7 @@
</varlistentry> -->
<varlistentry>
- <term>Graphical Desktops (multiple options)</term>
+ <term>Graphical Desktops (multiple options, one radio button each)</term>
<listitem>
<para>
Fedora offers a variety of graphical desktop environments, which can be enhanced with add-ons such as the <application>LibreOffice</application> productivity suite, graphical tools such as the <application>GIMP</application>, and multimedia applications. The available environments are:
diff --git a/en-US/Package_Selection_common-para-12.xml b/en-US/Package_Selection_common-para-12.xml
new file mode 100644
index 0000000..d4a0c3b
--- /dev/null
+++ b/en-US/Package_Selection_common-para-12.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ To specify which packages Fedora will install, select <guilabel>Software Selection</guilabel> from the Installation Hub.
+</para>
11 years, 4 months