commit d30a19a403ce28189e2899edb8026d6ce8e277b9
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Mon Nov 24 10:10:16 2014 +0100
Markup, language, and style updates
en-US/Manually_Upgrading_the_Kernel.xml | 74 ++++++++++++-------------------
1 files changed, 28 insertions(+), 46 deletions(-)
---
diff --git a/en-US/Manually_Upgrading_the_Kernel.xml
b/en-US/Manually_Upgrading_the_Kernel.xml
index 542bf7d..8abab0e 100644
--- a/en-US/Manually_Upgrading_the_Kernel.xml
+++ b/en-US/Manually_Upgrading_the_Kernel.xml
@@ -46,7 +46,7 @@
<secondary>installing kernel packages</secondary>
</indexterm>
<para>
- For more information on installing kernel packages with
<application>Yum</application>, refer to <xref
linkend="sec-Updating_Packages" />.
+ For more information on installing kernel packages with
<application>Yum</application>, see <xref
linkend="sec-Updating_Packages" />.
</para>
<section id="s1-kernel-packages">
<title>Overview of Kernel Packages</title>
@@ -143,7 +143,7 @@
<package>kernel-doc</package> — Documentation files from the kernel
source. Various portions of the Linux kernel and the device drivers shipped with it are
documented in these files. Installation of this package provides a reference to the
options that can be passed to Linux kernel modules at load time.
</para>
<para>
- By default, these files are placed in the
<filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/</filename>
directory.
+ By default, these files are placed in the
<filename>/usr/share/doc/kernel-doc-<replaceable>kernel_version</replaceable>/Documentation/</filename>
directory.
</para>
</listitem>
<listitem>
@@ -182,12 +182,8 @@
<secondary>upgrading</secondary>
<tertiary>working boot media</tertiary>
</indexterm>
- <para>
- Before upgrading the kernel, it is recommended that you take some precautionary
steps.
- </para>
- <para>
- First, ensure that working boot media exists for the system in case a problem
occurs. If the boot loader is not configured properly to boot the new kernel, the system
cannot be booted into &MAJOROS; without working boot media.
- </para>
+ <para>Before upgrading the kernel, it is recommended that you take some
precautionary steps.</para>
+ <para>First, ensure that working boot media exists for the system in case a
problem occurs. If the boot loader is not configured properly to boot the new kernel, you
can use this media to boot into &MAJOROS;.</para>
<!--silas: the following instructions for making (USB) boot media are adapted from
the RHEL6 beta Installation Guide, "Alternative Method to Make Minimal USB Boot
Media" section-->
<para>
USB media often comes in the form of flash devices sometimes called
<firstterm>pen drives</firstterm>, <firstterm>thumb
disks</firstterm>, or <firstterm>keys</firstterm>, or as an
externally-connected hard disk device. Almost all media of this type is formatted as a
<systemitem class="filesystem">VFAT</systemitem> file system. You
can create bootable USB media on media formatted as <systemitem
class="filesystem">ext2</systemitem>, <systemitem
class="filesystem">ext3</systemitem>, <systemitem
class="filesystem">ext4</systemitem>, or <systemitem
class="filesystem">VFAT</systemitem>.
@@ -200,49 +196,35 @@
</para>
<procedure>
<step>
- <para>
- Install the <application>SYSLINUX</application> bootloader on the
USB storage device:
- </para>
- <screen><command>syslinux
/dev/<replaceable>sdX1</replaceable></command></screen>
- <para>
- ...where <replaceable>sdX</replaceable> is the device name.
- </para>
+ <para>Install the <application>SYSLINUX</application>
bootloader on the USB storage device:</para>
+ <screen>~]# <command>syslinux
/dev/<replaceable>sdX1</replaceable></command></screen>
+ <para>...where <replaceable>sdX</replaceable> is the device
name.</para>
</step>
<step>
- <para>
- Create mount points for <filename>boot.iso</filename> and the USB
storage device:
- </para>
- <screen><command>mkdir /mnt/isoboot
/mnt/diskboot</command></screen>
+ <para>Create mount points for <filename>boot.iso</filename> and
the USB storage device:</para>
+ <screen>~]# <command>mkdir /mnt/isoboot
/mnt/diskboot</command></screen>
</step>
<step>
- <para>
- Mount <filename>boot.iso</filename>:
- </para>
- <screen><command>mount -o loop boot.iso
/mnt/isoboot</command></screen>
+ <para>Mount <filename>boot.iso</filename>:</para>
+ <screen>~]# <command>mount -o loop boot.iso
/mnt/isoboot</command></screen>
</step>
<step>
- <para>
- Mount the USB storage device:
- </para>
- <screen><command>mount
/dev/<replaceable>sdX1</replaceable>
/mnt/diskboot</command></screen>
+ <para>Mount the USB storage device:</para>
+ <screen>~]# <command>mount
/dev/<replaceable>sdX1</replaceable>
/mnt/diskboot</command></screen>
</step>
<step>
- <para>
- Copy the <application>ISOLINUX</application> files from the
<filename>boot.iso</filename> to the USB storage device:
- </para>
- <screen><command>cp /mnt/isoboot/isolinux/*
/mnt/diskboot</command></screen>
+ <para>Copy the <application>ISOLINUX</application> files from
the <filename>boot.iso</filename> to the USB storage device:</para>
+ <screen>~]# <command>cp /mnt/isoboot/isolinux/*
/mnt/diskboot</command></screen>
</step>
<step>
- <para>
- Use the <filename>isolinux.cfg</filename> file from
<filename>boot.iso</filename> as the
<filename>syslinux.cfg</filename> file for the USB device:
- </para>
- <screen><command>grep -v local /mnt/isoboot/isolinux/isolinux.cfg
> /mnt/diskboot/syslinux.cfg</command></screen>
+ <para>Use the <filename>isolinux.cfg</filename> file from
<filename>boot.iso</filename> as the
<filename>syslinux.cfg</filename> file for the USB device:</para>
+ <screen>~]# <command>grep -v local
/mnt/isoboot/isolinux/isolinux.cfg > /mnt/diskboot/syslinux.cfg</command>
+ </screen>
</step>
<step>
- <para>
- Unmount <filename>boot.iso</filename> and the USB storage device:
- </para>
- <screen><command>umount /mnt/isoboot
/mnt/diskboot</command></screen>
+ <para>Unmount <filename>boot.iso</filename> and the USB storage
device:</para>
+ <screen>~]# <command>umount /mnt/isoboot
/mnt/diskboot</command>
+ </screen>
</step>
<step>
<para>
@@ -270,7 +252,7 @@ kernel-modules-extra.x86_64 3.17.3-200.fc20
@updates<
From the output, determine which packages need to be downloaded for the kernel
upgrade. For a single processor system, the only required package is the
<package>kernel</package> package. See <xref
linkend="s1-kernel-packages" /> for descriptions of the different packages.
</para>
<!-- RHEL6: the following info is probably unnecessary
- <para>In the file name, each kernel package contains the architecture for which
the package was built. The format is
kernel-<replaceable><variant></replaceable>-<replaceable><version></replaceable>.<replaceable><arch></replaceable>.rpm,
where <replaceable><variant></replaceable> is one of either
<package>PAE</package>, <package>xen</package>, and so forth. The
<replaceable><arch></replaceable> is one of the
following:</para>
+ <para>In the file name, each kernel package contains the architecture for which
the package was built. The format is
kernel-<replaceable>variant</replaceable>-<replaceable>version</replaceable>.<replaceable>arch</replaceable>.rpm,
where <replaceable>variant</replaceable> is one of either
<package>PAE</package>, <package>xen</package>, and so forth. The
<replaceable>arch</replaceable> is one of the following:</para>
<itemizedlist>
<listitem>
<para>
@@ -368,7 +350,7 @@ kernel-modules-extra.x86_64 3.17.3-200.fc20
@updates<
<para>
At a shell prompt, change to the directory that contains the kernel RPM packages.
Use <option>-i</option> argument with the <command>rpm</command>
command to keep the old kernel. Do <emphasis>not</emphasis> use the
<option>-U</option> option, since it overwrites the currently installed
kernel, which creates boot loader problems. For example:
</para>
- <screen><command>rpm -ivh
kernel-<replaceable>kernel_version</replaceable>.<replaceable>arch</replaceable>.rpm
</command></screen>
+ <screen>~]# <command>rpm -ivh
kernel-<replaceable>kernel_version</replaceable>.<replaceable>arch</replaceable>.rpm
</command></screen>
<para>
The next step is to verify that the initial RAM disk image has been created. See
<xref linkend="sec-Verifying_the_Initial_RAM_Disk_Image" /> for details.
</para>
@@ -394,7 +376,7 @@ kernel-modules-extra.x86_64 3.17.3-200.fc20
@updates<
<title>Verifying the Initial RAM Disk Image</title>
<step>
<para>
- As <systemitem class="username">root</systemitem>, list
the contents in the <filename>/boot</filename> directory and find the kernel
(<filename>vmlinuz-<replaceable>kernel_version</replaceable></filename>)
and
<filename>initramfs-<replaceable>kernel_version</replaceable></filename>
with the latest (most recent) version number:
+ As <systemitem class="username">root</systemitem>, list
the contents in the <filename>/boot/</filename> directory and find the kernel
(<filename>vmlinuz-<replaceable>kernel_version</replaceable></filename>)
and
<filename>initramfs-<replaceable>kernel_version</replaceable></filename>
with the latest (most recent) version number:
</para>
<example
id="ex-Ensuring_that_the_kernel_and_initramfs_versions_match">
@@ -443,15 +425,15 @@ vmlinuz-3.17.3-200.fc20.x86_64</screen>
</listitem>
</itemizedlist>
<important
id="important-initrd_files_in_the__boot_directory_are_not_the_same_as_initramfs_files">
- <title>initrd files in the /boot directory are not the same as initramfs
files</title>
+ <title>initrd files in the /boot/ directory are not the same as initramfs
files</title>
<para>
- In the <filename class="directory">/boot</filename>
directory you may find several
<filename>initrd-<replaceable><kernel_version></replaceable>kdump.img</filename>
files. These are special files created by the <systemitem
class="service">kdump</systemitem> mechanism for kernel debugging
purposes, are not used to boot the system, and can safely be ignored. For more information
on <systemitem class="service">kdump</systemitem>, refer to <xref
linkend="ch-kdump" />.
+ In the <filename class="directory">/boot/</filename>
directory you may find several
<filename>initrd-<replaceable>kernel_version</replaceable>kdump.img</filename>
files. These are special files created by the <systemitem
class="service">kdump</systemitem> mechanism for kernel debugging
purposes, are not used to boot the system, and can safely be ignored. For more information
on <systemitem class="service">kdump</systemitem>, refer to <xref
linkend="ch-kdump" />.
</para>
</important>
</step>
<step performance="optional">
<para>
- (Optional) If your
<filename>initramfs-<replaceable>kernel_version</replaceable></filename>
file does not match the version of the latest kernel in
<filename>/boot</filename>, or, in certain other situations, you may need to
generate an <filename>initramfs</filename> file with the
<application>Dracut</application> utility. Simply invoking
<command>dracut</command> as <systemitem
class="username">root</systemitem> without options causes it to
generate an <filename>initramfs</filename> file in the
<filename>/boot</filename> directory for the latest kernel present in that
directory:
+ (Optional) If your
<filename>initramfs-<replaceable>kernel_version</replaceable></filename>
file does not match the version of the latest kernel in
<filename>/boot</filename>, or, in certain other situations, you may need to
generate an <filename>initramfs</filename> file with the
<application>Dracut</application> utility. Simply invoking
<command>dracut</command> as <systemitem
class="username">root</systemitem> without options causes it to
generate an <filename>initramfs</filename> file in the <filename
class="directory">/boot/</filename> directory for the latest kernel
present in that directory:
</para>
<screen>~]# <command>dracut</command></screen>
<para>
@@ -477,7 +459,7 @@ Version: dracut-037-11.git20140402.fc20
</step>
<step>
<para>
- Examine the <filename>/boot/grub2/grub.cfg</filename> configuration
file to ensure that an <computeroutput>initrd
<filename>/<replaceable>path</replaceable>/initramfs-<replaceable>kernel_version</replaceable>.img</filename></computeroutput>
exists for the kernel version you are booting. For example:
+ Examine the <filename>/boot/grub2/grub.cfg</filename> configuration
file to ensure that an <computeroutput>initrd
<filename>/<replaceable>path</replaceable>/initramfs-<replaceable>kernel_version</replaceable>.img</filename></computeroutput>
file exists for the kernel version you are booting. For example:
</para>
<screen>~]# <command>grep initrd
/boot/grub2/grub.cfg</command>
initrd /initramfs-3.17.3-200.fc20.x86_64.img