en-US/Boot_x86_ppc-para-7.xml en-US/Boot_x86_ppc-para-8.xml en-US/Boot_x86_ppc-procedure-1.xml en-US/Boot_x86_ppc-title-4.xml en-US/Boot_x86_ppc-variablelist-1.xml en-US/Boot-x86.xml en-US/Graphical_Installation-x86.xml en-US/Ksconfig.xml en-US/Note-Multiple_NICs_and_PXE.xml en-US/Verifying_Media.xml
Rüdiger Landmann
rlandmann at fedoraproject.org
Thu Apr 29 04:32:49 UTC 2010
en-US/Boot-x86.xml | 135 ++++++----------------------------
en-US/Boot_x86_ppc-para-7.xml | 8 ++
en-US/Boot_x86_ppc-para-8.xml | 8 ++
en-US/Boot_x86_ppc-procedure-1.xml | 23 +++++
en-US/Boot_x86_ppc-title-4.xml | 8 ++
en-US/Boot_x86_ppc-variablelist-1.xml | 9 ++
en-US/Graphical_Installation-x86.xml | 5 +
en-US/Ksconfig.xml | 2
en-US/Note-Multiple_NICs_and_PXE.xml | 21 +++++
en-US/Verifying_Media.xml | 15 +++
10 files changed, 121 insertions(+), 113 deletions(-)
New commits:
commit d7bbd968162c5f2bbd40867d7f38a91cee09573d
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Thu Apr 29 14:32:10 2010 +1000
revise section 6.3
diff --git a/en-US/Boot-x86.xml b/en-US/Boot-x86.xml
index e8cb1d0..5c637d6 100644
--- a/en-US/Boot-x86.xml
+++ b/en-US/Boot-x86.xml
@@ -104,119 +104,32 @@
Refer to <xref linkend="s1-installmethod-x86"/> for information about installing from locations other than the media with which you booted the system.
</para>
</section>
- <section id="sn-verifying-media">
- <title>Verifying Media</title>
- <para>The distribution DVD media and the Live CD media offer an
- option to verify the integrity of the media. Recording errors
- sometimes occur while producing CD or DVD media in home computer
- equipment. An error in the data for package chosen in the
- installation program can cause the installation to abort. To
- minimize the chances of data errors affecting the installation,
- verify the media before installing.</para>
-<!-- <note>
- <title>BitTorrent Automatically Verifies File Integrity</title>
- <para>If you use BitTorrent, any files you download are automatically
- validated. If your file completes downloading you do not need to
- check it. Once you burn your CD or DVD, however, during the installation
- you should still use mediacheck to verify the integrity of the media.</para>
- </note> -->
- <section id="sn-verifying-livecd">
- <title>Verifying the Live CD</title>
- <para>If you boot from the Live CD, choose <guilabel>Verify and
- Boot</guilabel> from the boot menu. The
- verification process runs automatically during the boot process,
- and if it succeeds, the Live CD continues loading. If the
- verification fails, create a new Live CD using the ISO image you
- downloaded earlier.</para>
- </section>
- <section id="sn-verifying-dvd">
- <title>Verifying the DVD</title>
- <para>If you boot from the Fedora distribution DVD, the option
- to verify the media appears after you choose to install
- Fedora. If the verification succeeds, the installation
- process proceeds normally. If the process fails, create a new
- DVD using the ISO image you downloaded earlier.</para>
- </section>
- </section>
-
- <section id="sn-booting-from-pxe">
- <title>Booting from the Network using PXE</title>
-
- <para>
- To boot with <indexterm>
- <primary>PXE (Pre-boot eXecution Environment)</primary>
- </indexterm> PXE, you need a properly configured server, and a
- network interface in your computer that supports PXE. For
- information on how to configure a PXE server, refer to <xref
- linkend="ap-install-server"/>.
- </para>
-
- <para>
- Configure the computer to boot from the network interface. This
- option is in the BIOS, and may be labeled <option>Network
- Boot</option> or <option>Boot Services</option>. Once you
- properly configure PXE booting, the computer can boot the Fedora
- installation system without any other media.
- </para>
-
- <para>
- To boot a computer from a PXE server:
- </para>
-
- <procedure>
- <step>
- <para>
- Ensure that the network cable is attached. The link indicator
- light on the network socket should be lit, even if the
- computer is not switched on.
- </para>
- </step>
- <step>
- <para>
- Switch on the computer.
- </para>
- </step>
- <step>
- <para>
- A menu screen appears. Press the number key that corresponds
- to the desired option.
- </para>
- </step>
- </procedure>
-
- <note>
- <title>PXE Troubleshooting</title>
- <para>
- If your PC does not boot from the netboot server, ensure that
- the BIOS is configured to boot first from the correct network
- interface. Some BIOS systems specify the network interface as a
- possible boot device, but do not support the PXE standard. Refer
- to your hardware documentation for more information.
- </para>
- </note>
-<note>
- <title>Multiple NICs and PXE installation </title>
- <para>
- Some servers with multiple network interfaces may
- not assign eth0 to the first network interface as BIOS
- knows it, which can cause the installer to try using a
- different network interface than was used by PXE. To
- change this behavior, use the following in <filename>pxelinux.cfg/*</filename>
- config files: </para>
- <para><option>IPAPPEND 2</option>
- </para>
- <para><option>APPEND ksdevice=bootif</option>
- </para>
- <para>The configuration options above cause the installer to use the
- same network interface as BIOS and PXE use. You can also use the following option:
+ <section id="sn-booting-from-pxe-x86">
+ <xi:include href="Boot_x86_ppc-title-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Booting from the Network using PXE -->
+
+ <xi:include href="Boot_x86_ppc-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- To boot with PXE, you need a properly configured server -->
+
+ <para>
+ Configure the computer to boot from the network interface. This option is in the BIOS, and may be labeled <option>Network Boot</option> or <option>Boot Services</option>. Once you properly configure PXE booting, the computer can boot the Fedora installation system without any other media.
</para>
- <para><option>ksdevice=link</option>
+
+ <xi:include href="Boot_x86_ppc-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- To boot a computer from a PXE server: -->
+
+ <xi:include href="Boot_x86_ppc-procedure-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Ensure that the network cable is attached -->
+
+ <para>
+ If your PC does not boot from the netboot server, ensure that the BIOS is configured to boot first from the correct network interface. Some BIOS systems specify the network interface as a possible boot device, but do not support the PXE standard. Refer to your hardware documentation for more information.
</para>
- <para>This option causes the installer to use the first network device
- it finds that is linked to a network switch.
- </para>
- </note>
- </section>
+
+ <xi:include href="Note-Multiple_NICs_and_PXE.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Some servers with multiple network interfaces might not assign -->
+
+ </section>
+
<section id="sn-graphics-problem">
<title>Graphical and Text Interfaces</title>
<important>
diff --git a/en-US/Boot_x86_ppc-para-7.xml b/en-US/Boot_x86_ppc-para-7.xml
new file mode 100644
index 0000000..d354203
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-7.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ To boot with <indexterm> <primary>PXE (Pre-boot eXecution Environment)</primary> </indexterm> PXE, you need a properly configured server, and a network interface in your computer that supports PXE. For information on how to configure a PXE server, refer to <xref linkend="ap-install-server"/>.
+</para>
+
diff --git a/en-US/Boot_x86_ppc-para-8.xml b/en-US/Boot_x86_ppc-para-8.xml
new file mode 100644
index 0000000..2cb4461
--- /dev/null
+++ b/en-US/Boot_x86_ppc-para-8.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<para>
+ To boot a computer from a PXE server:
+</para>
+
diff --git a/en-US/Boot_x86_ppc-procedure-1.xml b/en-US/Boot_x86_ppc-procedure-1.xml
new file mode 100644
index 0000000..7118848
--- /dev/null
+++ b/en-US/Boot_x86_ppc-procedure-1.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE procedure PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<procedure>
+ <step>
+ <para>
+ Ensure that the network cable is attached. The link indicator light on the network socket should be lit, even if the computer is not switched on.
+ </para>
+ </step>
+ <step>
+ <para>
+ Switch on the computer.
+ </para>
+ </step>
+ <step>
+ <para>
+ A menu screen appears. Press the number key that corresponds to the desired option.
+ </para>
+ </step>
+</procedure>
+
+
diff --git a/en-US/Boot_x86_ppc-title-4.xml b/en-US/Boot_x86_ppc-title-4.xml
new file mode 100644
index 0000000..662c75f
--- /dev/null
+++ b/en-US/Boot_x86_ppc-title-4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<title>
+ Booting from the Network using PXE
+</title>
+
diff --git a/en-US/Boot_x86_ppc-variablelist-1.xml b/en-US/Boot_x86_ppc-variablelist-1.xml
index c3aa0b5..c6eece6 100644
--- a/en-US/Boot_x86_ppc-variablelist-1.xml
+++ b/en-US/Boot_x86_ppc-variablelist-1.xml
@@ -43,5 +43,14 @@
</para>
</listitem>
</varlistentry> -->
+ <!-- <section id="sn-verifying-livecd">
+ <title>Verifying the Live CD</title>
+ <para>If you boot from the Live CD, choose <guilabel>Verify and
+ Boot</guilabel> from the boot menu. The
+ verification process runs automatically during the boot process,
+ and if it succeeds, the Live CD continues loading. If the
+ verification fails, create a new Live CD using the ISO image you
+ downloaded earlier.</para>
+ </section> -->
</variablelist>
diff --git a/en-US/Graphical_Installation-x86.xml b/en-US/Graphical_Installation-x86.xml
index 25f7b9d..b1d6f9c 100644
--- a/en-US/Graphical_Installation-x86.xml
+++ b/en-US/Graphical_Installation-x86.xml
@@ -229,7 +229,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Beginning_Installation_URL-x86.xml"/>
<!-- Installing via FTP or HTTP -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
+ <xi:include href="Verifying_Media.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <!-- Verifying Media - The DVD offers an option to verify the integrity of the media. -->
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Welcome-x86.xml"/>
<!-- Welcome to Red Hat Enterprise Linux -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Language_Selection-x86.xml"/>
diff --git a/en-US/Ksconfig.xml b/en-US/Ksconfig.xml
index e32079e..cbd46f3 100644
--- a/en-US/Ksconfig.xml
+++ b/en-US/Ksconfig.xml
@@ -166,7 +166,7 @@
<listitem>
<para>
- <guilabel>Hard Drive</guilabel> — Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO (or CD-ROM) images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux mediacheck</command> boot option as discussed in <xref linkend="sn-verifying-media"/>. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
+ <guilabel>Hard Drive</guilabel> — Choose this option to install or upgrade from a hard drive. Hard drive installations require the use of ISO (or CD-ROM) images. Be sure to verify that the ISO images are intact before you start the installation. To verify them, use an <command>md5sum</command> program as well as the <command>linux mediacheck</command> boot option as discussed in <xref linkend="sn-boot-mediacheck"/>. Enter the hard drive partition that contains the ISO images (for example, <filename>/dev/hda1</filename>) in the <guilabel>Hard Drive Partition</guilabel> text box. Enter the directory that contains the ISO images in the <guilabel>Hard Drive Directory</guilabel> text box.
</para>
</listitem>
</itemizedlist>
diff --git a/en-US/Note-Multiple_NICs_and_PXE.xml b/en-US/Note-Multiple_NICs_and_PXE.xml
new file mode 100644
index 0000000..53242be
--- /dev/null
+++ b/en-US/Note-Multiple_NICs_and_PXE.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<note>
+ <title>Note — Multiple NICs and PXE installation </title>
+ <para>
+ Some servers with multiple network interfaces might not assign eth0 to the first network interface as the firmware interface knows it, which can cause the installer to try to use a different network interface from the one that was used by PXE. To change this behavior, use the following in <filename>pxelinux.cfg/*</filename> config files:
+ </para>
+<programlisting>IPAPPEND 2
+APPEND ksdevice=bootif</programlisting>
+ <para>
+ These configuration options above cause the installer to use the same network interface the firmware interface and PXE use. You can also use the following option:
+ </para>
+<programlisting>ksdevice=link</programlisting>
+ <para>
+ This option causes the installer to use the first network device it finds that is linked to a network switch.
+ </para>
+</note>
+
+
diff --git a/en-US/Verifying_Media.xml b/en-US/Verifying_Media.xml
new file mode 100644
index 0000000..c388669
--- /dev/null
+++ b/en-US/Verifying_Media.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<section>
+ <title>Verifying Media</title>
+ <para>
+ The DVD offers an option to verify the integrity of the media. Recording errors sometimes occur while producing CD or DVD media. An error in the data for package chosen in the installation program can cause the installation to abort. To minimize the chances of data errors affecting the installation, verify the media before installing.
+ </para>
+ <para>
+ If the verification succeeds, the installation process proceeds normally. If the process fails, create a new DVD using the ISO image you downloaded earlier.
+ </para>
+</section>
+
+
More information about the docs-commits
mailing list