r722 - in trunk/BOOK/bootable: . alpha mips ppc sparc x86 x86_64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Nov 19 09:59:46 PST 2005


Author: manuel
Date: 2005-11-19 10:59:45 -0700 (Sat, 19 Nov 2005)
New Revision: 722

Removed:
   trunk/BOOK/bootable/mips64-chapter.xml
   trunk/BOOK/bootable/mips64/
   trunk/BOOK/bootable/sparc64-chapter.xml
   trunk/BOOK/bootable/sparc64/
   trunk/BOOK/bootable/x86_64/grub.xml
Modified:
   trunk/BOOK/bootable/alpha/kernel.xml
   trunk/BOOK/bootable/mips/colo.xml
   trunk/BOOK/bootable/mips/kernel.xml
   trunk/BOOK/bootable/ppc/kernel.xml
   trunk/BOOK/bootable/ppc/yaboot.xml
   trunk/BOOK/bootable/sparc/kernel.xml
   trunk/BOOK/bootable/sparc/silo.xml
   trunk/BOOK/bootable/x86/grub.xml
   trunk/BOOK/bootable/x86/kernel.xml
   trunk/BOOK/bootable/x86_64-chapter.xml
   trunk/BOOK/bootable/x86_64/kernel.xml
Log:
Unifiying linux and linux-libc-headers package version entities. Bootable chapter.

Modified: trunk/BOOK/bootable/alpha/kernel.xml
===================================================================
--- trunk/BOOK/bootable/alpha/kernel.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/alpha/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -8,7 +8,7 @@
 <sect1 id="ch-bootable-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-alpha-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -109,29 +109,31 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-alpha-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-alpha-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-alpha-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-alpha-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/mips/colo.xml
===================================================================
--- trunk/BOOK/bootable/mips/colo.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/mips/colo.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -40,8 +40,8 @@
 #
 # load linux
 #
-lcd 'Booting &linux-mips-version;...'
-load vmlinux-&linux-mips-version;.gz
+lcd 'Booting &linux-version;...'
+load vmlinux-&linux-version;.gz
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
 EOF</userinput></screen>
 

Modified: trunk/BOOK/bootable/mips/kernel.xml
===================================================================
--- trunk/BOOK/bootable/mips/kernel.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/mips/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -8,7 +8,7 @@
 <sect1 id="ch-bootable-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-mips-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -115,30 +115,32 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/vmlinux-&linux-mips-version;
-gzip -9 /boot/vmlinux-&linux-mips-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/vmlinux-&linux-version;
+gzip -9 /boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-mips-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-mips-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-mips-version;</filename>
-    directory to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Deleted: trunk/BOOK/bootable/mips64-chapter.xml
===================================================================
--- trunk/BOOK/bootable/mips64-chapter.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/mips64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the LFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
-
-</chapter>

Modified: trunk/BOOK/bootable/ppc/kernel.xml
===================================================================
--- trunk/BOOK/bootable/ppc/kernel.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/ppc/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -8,7 +8,7 @@
 <sect1 id="ch-bootable-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-ppc-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -109,29 +109,31 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-ppc-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-ppc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-ppc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-ppc-version;</filename> directory to
-    ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/ppc/yaboot.xml
===================================================================
--- trunk/BOOK/bootable/ppc/yaboot.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/ppc/yaboot.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -95,7 +95,7 @@
 # The first entry is for LFS.
 # For all images, the pathname is relative to the filesystem
 # on which they are mounted.
-image=/boot/lfskernel-&linux-ppc-version;
+image=/boot/lfskernel-&linux-version;
     label=&version;
     read-only</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/bootable/sparc/kernel.xml
===================================================================
--- trunk/BOOK/bootable/sparc/kernel.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/sparc/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -8,7 +8,7 @@
 <sect1 id="ch-bootable-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-sparc-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -109,29 +109,31 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-sparc-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-sparc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-sparc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-sparc-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/sparc/silo.xml
===================================================================
--- trunk/BOOK/bootable/sparc/silo.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/sparc/silo.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -24,7 +24,7 @@
 root = /dev/sda1      # Root partition
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-sparc-version;
+image = /boot/lfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
 EOF</userinput></screen>

Deleted: trunk/BOOK/bootable/sparc64-chapter.xml
===================================================================
--- trunk/BOOK/bootable/sparc64-chapter.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/sparc64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the LFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
-
-</chapter>

Modified: trunk/BOOK/bootable/x86/grub.xml
===================================================================
--- trunk/BOOK/bootable/x86/grub.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/x86/grub.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -103,7 +103,7 @@
 # The first entry is for LFS.
 title LFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
+kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
 

Modified: trunk/BOOK/bootable/x86/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86/kernel.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/x86/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -8,7 +8,7 @@
 <sect1 id="ch-bootable-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-x86-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -120,21 +120,21 @@
 
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-x86-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
     as well as the addresses of the kernel data structures for the running
     kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-x86-version;</userinput></screen>
+<screen os="w1"><userinput>cp System.map /boot/System.map-&linux-version;</userinput></screen>
 
     <para os="x">The kernel configuration file <filename>.config</filename>
     produced by the <command>make menuconfig</command> step above contains
     all the configuration selections for the kernel that was just compiled.
     It is a good idea to keep this file for future reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-x86-version;</userinput></screen>
+<screen os="x1"><userinput>cp .config /boot/config-&linux-version;</userinput></screen>
 
     <para os="y">It is important to note that the files in the kernel source
     directory are not owned by <systemitem class="username">root</systemitem>.
@@ -149,9 +149,9 @@
     on the machine. That person would then have write access to the kernel
     source.</para>
 
-    <para>If the kernel source tree is going to retained, run
+    <para os="y1">If the kernel source tree is going to retained, run
     <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-x86-version;</filename> directory to
+    class="directory">linux-&linux-version;</filename> directory to
     ensure all files are owned by user <systemitem
     class="username">root</systemitem>.</para>
 

Deleted: trunk/BOOK/bootable/x86_64/grub.xml
===================================================================
--- trunk/BOOK/bootable/x86_64/grub.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/x86_64/grub.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-bootable-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the LFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-<screen><userinput>cat > /boot/grub/menu.lst << "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for LFS.
-title LFS &version;
-root (hd0,3)
-kernel /boot/lfskernel-&linux-x86_64-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='q'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='r'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='s'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='t'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='u'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='v'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='w'])"/>
-
-</sect1>

Modified: trunk/BOOK/bootable/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86_64/kernel.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/x86_64/kernel.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -8,7 +8,7 @@
 <sect1 id="ch-bootable-kernel" role="wrap">
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-x86_64-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
     <primary sortas="a-Linux">Linux</primary>
@@ -109,29 +109,31 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/lfskernel-&linux-x86_64-version;</userinput></screen>
+<screen><userinput>cp arch/x86_64/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-x86_64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-x86_64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-x86_64-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/bootable/x86_64-chapter.xml	2005-11-19 17:59:10 UTC (rev 721)
+++ trunk/BOOK/bootable/x86_64-chapter.xml	2005-11-19 17:59:45 UTC (rev 722)
@@ -14,6 +14,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
 
 </chapter>




More information about the cross-lfs mailing list