r6751 - in branches/cross-lfs/BOOK: . boot/common boot/mips boot/mips64 boot/ppc boot/sparc boot/sparc64 boot/sparc64-64 boot/x86 boot/x86_64 bootable bootable/common bootable/mips bootable/mips64 bootable/ppc bootable/sparc bootable/sparc64 bootable/x86 bootable/x86_64 bootscripts/mips

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Aug 25 11:31:08 PDT 2005


Author: manuel
Date: 2005-08-25 12:31:06 -0600 (Thu, 25 Aug 2005)
New Revision: 6751

Added:
   branches/cross-lfs/BOOK/bootable/sparc64/silo.xml
Modified:
   branches/cross-lfs/BOOK/boot/common/fstab.xml
   branches/cross-lfs/BOOK/boot/mips/colo.xml
   branches/cross-lfs/BOOK/boot/mips/kernel.xml
   branches/cross-lfs/BOOK/boot/mips64/colo.xml
   branches/cross-lfs/BOOK/boot/mips64/kernel.xml
   branches/cross-lfs/BOOK/boot/ppc/kernel.xml
   branches/cross-lfs/BOOK/boot/sparc/fstab.xml
   branches/cross-lfs/BOOK/boot/sparc/silo.xml
   branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml
   branches/cross-lfs/BOOK/boot/sparc64/silo.xml
   branches/cross-lfs/BOOK/boot/x86/grub.xml
   branches/cross-lfs/BOOK/boot/x86_64/grub.xml
   branches/cross-lfs/BOOK/bootable/common/fstab.xml
   branches/cross-lfs/BOOK/bootable/mips/colo.xml
   branches/cross-lfs/BOOK/bootable/mips/kernel.xml
   branches/cross-lfs/BOOK/bootable/mips64/colo.xml
   branches/cross-lfs/BOOK/bootable/mips64/kernel.xml
   branches/cross-lfs/BOOK/bootable/ppc/kernel.xml
   branches/cross-lfs/BOOK/bootable/sparc/fstab.xml
   branches/cross-lfs/BOOK/bootable/sparc/kernel.xml
   branches/cross-lfs/BOOK/bootable/sparc/silo.xml
   branches/cross-lfs/BOOK/bootable/sparc64-chapter.xml
   branches/cross-lfs/BOOK/bootable/sparc64/kernel.xml
   branches/cross-lfs/BOOK/bootable/x86/grub.xml
   branches/cross-lfs/BOOK/bootable/x86/kernel.xml
   branches/cross-lfs/BOOK/bootable/x86_64/grub.xml
   branches/cross-lfs/BOOK/bootable/x86_64/kernel.xml
   branches/cross-lfs/BOOK/bootscripts/mips/bootscripts.xml
   branches/cross-lfs/BOOK/general.ent
Log:
Xinclude redo on bootscripts/ and bootable/.

Modified: branches/cross-lfs/BOOK/boot/common/fstab.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/fstab.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/common/fstab.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,7 +14,7 @@
     <primary sortas="e-${LFS}/etc/fstab">${LFS}/etc/fstab</primary>
   </indexterm>
 
-  <para>The <filename>${LFS}/etc/fstab</filename> file is used by some
+  <para os="a">The <filename>${LFS}/etc/fstab</filename> file is used by some
   programs to determine where file systems are to be mounted by default,
   which must be checked, and in which order. Create a new file systems
   table like this:</para>
@@ -36,14 +36,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(/sect1/para[4])"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/mips/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/mips/colo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -17,15 +17,15 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(/sect1/note[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  href="../../bootable/mips/colo.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  xpointer="xpointer(//*[@os='d'])"/>
 
 <screen><userinput>cat > ${LFS}/boot/default.colo << "EOF"
 #:CoLo:#

Modified: branches/cross-lfs/BOOK/boot/mips/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/mips/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -21,7 +21,7 @@
     <title/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(id('package-kernel')/para[1])"/>
 
     <segmentedlist>
@@ -35,7 +35,7 @@
     </segmentedlist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/boot/mips64/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/mips64/colo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,16 +16,16 @@
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(/sect1/note[1])"/>
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 <screen><userinput>cat > ${LFS}/boot/default.colo << "EOF"
 #:CoLo:#

Modified: branches/cross-lfs/BOOK/boot/mips64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/mips64/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -21,7 +21,7 @@
     <title/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(id('package-kernel')/para[1])"/>
 
     <segmentedlist>
@@ -35,7 +35,7 @@
     </segmentedlist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/boot/ppc/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/ppc/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/ppc/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -19,7 +19,7 @@
     <title/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(id('package-kernel')/para[1])"/>
 
     <segmentedlist>
@@ -33,7 +33,7 @@
     </segmentedlist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/mips/kernel.xml"
+    href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/boot/sparc/fstab.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/fstab.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/sparc/fstab.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,12 +14,11 @@
     <primary sortas="e-${LFS}/etc/fstab">${LFS}/etc/fstab</primary>
   </indexterm>
 
-  <para>The <filename>${LFS}/etc/fstab</filename> file is used by some
-  programs to determine where file systems are to be mounted by default,
-  which must be checked, and in which order. Create a new file systems
-  table like this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cat > /etc/fstab << "EOF"
+<screen><userinput>cat > ${LFS}/etc/fstab << "EOF"
 <literal># Begin /etc/fstab
 
 # file system  mount-point  type   options         dump  fsck
@@ -36,15 +35,15 @@
 EOF</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(/sect1/para[3])"/>
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(/sect1/para[4])"/>
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/sparc/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/sparc/silo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,8 +15,8 @@
     <secondary>boot, configuring</secondary>
   </indexterm>
 
-  <para>This is for the configuration of silo, similar to what
-  is in bootscripts.</para>
+  <para os="a">This is for the configuration of <command>silo</command>, similar
+  to what is in bootscripts.</para>
 
 <screen><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
 <literal># Begin /etc/silo.conf
@@ -26,15 +26,16 @@
 
 image = /boot/lfskernel-&linux-sparc-version;
   label = linux
-# End /etc/silo.conf</literal></userinput></screen>
+# End /etc/silo.conf</literal>
+EOF</userinput></screen>
 
-   <para>If you already have Silo installed on your target system, you do not
-   need to reinstall it. Silo is just a chain loader and has no bearing on the
-   system build.</para>
+   <para os="b">If you already have Silo installed on your target system, you do
+   not need to reinstall it. Silo is just a chain loader and has no bearing on
+   the system build.</para>
 
-   <para>After you get the build copied to when you can boot, you will need to
-   issue the following command:</para>
+   <para os="c">After you get the build copied to when you can boot, you will need
+   to issue the following command:</para>
 
-<screen><userinput>silo -f</userinput></screen>
+<screen os="d"><userinput>silo -f</userinput></screen>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/sparc64/silo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,10 +15,11 @@
     <secondary>boot, configuring</secondary>
   </indexterm>
 
-  <para>This is for the configuration of silo, similar to what
-  is in bootscripts.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
+<screen os="aa"><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
 <literal># Begin /etc/silo.conf
 partition = 1         # Boot partition (= root partition)
 root = /dev/sda1      # Root partition
@@ -26,15 +27,19 @@
 
 image = /boot/lfskernel-&linux-sparc64-version;
   label = linux
-# End /etc/silo.conf</literal></userinput></screen>
+# End /etc/silo.conf</literal>
+EOF</userinput></screen>
 
-   <para>If you already have Silo installed on your target system, you do not
-   need to reinstall it. Silo is just a chain loader and has no bearing on the
-   system build.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-   <para>After you get the build copied to when you can boot, you will need to
-   issue the following command:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>silo -f</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,26 +15,24 @@
     <secondary>boot, configuring</secondary>
   </indexterm>
 
-  <para>This is for the configuration of silo, similar to what
-  is in bootscripts.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc64/silo.xml"
+  xpointer="xpointer(//*[@os='aa'])"/>
 
-image = /boot/lfskernel-&linux-sparc64-version;
-  label = linux
-# End /etc/silo.conf</literal></userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-   <para>If you already have Silo installed on your target system, you do not
-   need to reinstall it. Silo is just a chain loader and has no bearing on the
-   system build.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-   <para>After you get the build copied to when you can boot, you will need to
-   issue the following command:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>silo -f</userinput></screen>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/boot/x86/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/x86/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/x86/grub.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,65 +15,64 @@
     <secondary>boot, configuring</secondary>
   </indexterm>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[1])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[2])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[3])"/>
-
-<screen><userinput>dd if=${LFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+<screen os="d"><userinput>dd if=${LFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
 dd if=${LFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[4])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/screen[2])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[5])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[6])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[7])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/screen[3])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/warning[1])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[8])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='l'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/screen[4])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>If all went well, GRUB will have reported finding its files
-    in <filename class="directory">${LFS}/boot/grub</filename>. That's
-    all there is to it. Quit the <command>grub</command> shell:</para>
+  <para os="n">If all went well, GRUB will have reported finding its files
+  in <filename class="directory">${LFS}/boot/grub</filename>. That's
+  all there is to it. Quit the <command>grub</command> shell:</para>
 
-<screen><userinput>quit</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='o'])"/>
 
-    <para>Create a <quote>menu list</quote> file defining GRUB's boot
-    menu:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='p'])"/>
 
 <screen><userinput>cat > ${LFS}/boot/grub/menu.lst << "EOF"
 <literal># Begin /boot/grub/menu.lst
@@ -93,10 +92,11 @@
 kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
-    <para>Add an entry for the host distribution if desired. It might look
-    like this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../bootable/x86/grub.xml"
+  xpointer="xpointer(//*[@os='q'])"/>
 
-<screen><userinput>cat >> ${LFS}/boot/grub/menu.lst << "EOF"
+<screen os="r"><userinput>cat >> ${LFS}/boot/grub/menu.lst << "EOF"
 <literal>title Red Hat
 root (hd0,2)
 kernel /boot/kernel-2.6.5 root=/dev/hda3

Modified: branches/cross-lfs/BOOK/boot/x86_64/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/x86_64/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/boot/x86_64/grub.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,70 +15,66 @@
     <secondary>boot, configuring</secondary>
   </indexterm>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[1])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[2])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[3])"/>
+  <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(/sect1/screen[1])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[4])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/screen[2])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[5])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[6])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[7])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/screen[3])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/warning[1])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/para[8])"/>
+  <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="../../bootable/x86/grub.xml"
-    xpointer="xpointer(/sect1/screen[4])"/>
+  <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(/sect1/para[9])"/>
+  <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(/sect1/screen[5])"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(//*[@os='p'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(/sect1/para[10])"/>
-
 <screen><userinput>cat > ${LFS}/boot/grub/menu.lst << "EOF"
 <literal># Begin /boot/grub/menu.lst
 
@@ -97,14 +93,12 @@
 kernel /boot/lfskernel-&linux-x86_64-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
-  <para>Add an entry for the host distribution if desired. It might look
-  like this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(//*[@os='q'])"/>
 
-<screen><userinput>cat >> /boot/grub/menu.lst << "EOF"
-<literal>title Red Hat
-root (hd0,2)
-kernel /boot/kernel-2.6.5 root=/dev/hda3
-initrd /boot/initrd-2.6.5</literal>
-EOF</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/grub.xml"
+  xpointer="xpointer(//*[@os='r'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/bootable/common/fstab.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/common/fstab.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/common/fstab.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,7 +14,7 @@
     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
   </indexterm>
 
-  <para>The <filename>/etc/fstab</filename> file is used by some
+  <para os="a">The <filename>/etc/fstab</filename> file is used by some
   programs to determine where file systems are to be mounted by default,
   in which order, and which must be checked (for integrity errors) prior
   to mounting. Create a new file systems table like this:</para>
@@ -34,7 +34,7 @@
 # End /etc/fstab</literal>
 EOF</userinput></screen>
 
-  <para>Replace <replaceable>[xxx]</replaceable>,
+  <para os="b">Replace <replaceable>[xxx]</replaceable>,
   <replaceable>[yyy]</replaceable>, and <replaceable>[fff]</replaceable>
   with the values appropriate for the system, for example, <filename
   class="partition">hda2</filename>, <filename
@@ -42,12 +42,12 @@
   class="filesystem">ext2</systemitem>. For details on the six
   fields in this file, see <command>man 5 fstab</command>.</para>
 
-  <para>When using a journalling file system, the <parameter>1
+  <para os="c">When using a journalling file system, the <parameter>1
   1</parameter> at the end of the line should be replaced with
   <parameter>0 0</parameter> because such a partition does not need to
   be dumped or checked.</para>
 
-  <para>The <filename class="directory">/dev/shm</filename> mount point
+  <para os="d">The <filename class="directory">/dev/shm</filename> mount point
   for <systemitem class="filesystem">tmpfs</systemitem> is included to
   allow enabling POSIX-shared memory. The kernel must have the required
   support built into it for this to work (more about this is in the next

Modified: branches/cross-lfs/BOOK/bootable/mips/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/mips/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/mips/colo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,10 +14,12 @@
     <primary sortas="a-Colo">Colo</primary>
   <secondary>configuring</secondary></indexterm>
 
-  <note><para>This bootloader is for the MIPS based cobalt servers RaQ,
-  RaQ2, Qube, or the Qube2.</para></note>
+  <note os="a">
+    <para>This bootloader is for the MIPS based cobalt servers RaQ,
+    RaQ2, Qube, or the Qube2.</para>
+  </note>
 
-  <para>Your shiny new LFS system is almost complete. One of the last
+  <para os="c">Your shiny new LFS system is almost complete. One of the last
   things to do is ensure you can boot it. The instructions below apply
   only to Colbalt mips/Cube2 servers. Information on <quote>boot
   loading</quote> for other architectures should be available in the
@@ -25,9 +27,9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/grub.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para>Earlier, we compiled and installed the Cobalt boot loader
+  <para os="d">Earlier, we compiled and installed the Cobalt boot loader
   software in preparation for this step. Now we will configure our system
   to boot using Colo. Here is a simpe <filename>default.colo</filename>
   to use.</para>
@@ -42,14 +44,14 @@
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
 EOF</userinput></screen>
 
-  <para>Included in <filename class="directory">/usr/lib/colo/examples</filename>
+  <para os="e">Included in <filename class="directory">/usr/lib/colo/examples</filename>
   are more examples of a <filename>default.colo</filename> file.</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/grub.xml"
-  xpointer="xpointer(/sect1/para[last()])"/>
+  xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>mkdir /etc/colo &&
+<screen os="f"><userinput>mkdir /etc/colo &&
 ln -s /boot/colo/default.colo /etc/colo</userinput></screen>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/bootable/mips/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/mips/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/mips/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
   <primary sortas="a-Linux">Linux</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('package-kernel'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 

Modified: branches/cross-lfs/BOOK/bootable/mips64/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/mips64/colo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/mips64/colo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,42 +14,42 @@
     <primary sortas="a-Colo">Colo</primary>
   <secondary>configuring</secondary></indexterm>
 
-  <note><para>This bootloader is for the MIPS based cobalt servers RaQ,
-  RaQ2, Qube, or the Qube2.</para></note>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <para>Your shiny new LFS system is almost complete. One of the last
-  things to do is ensure you can boot it. The instructions below apply
-  only to Colbalt mips/Cube2 servers. Information on <quote>boot
-  loading</quote> for other architectures should be available in the
-  usual resource-specific locations for those architectures.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(/sect1/para[2])"/>
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para>Earlier, we compiled and installed the Cobalt boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Colo. Here is a simpe <filename>default.colo</filename>
-  to use.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 <screen><userinput>cat > /boot/default.colo << "EOF"
 <literal>#:CoLo:#
 #
 # load linux
 #
-lcd 'Booting &linux-mips-version;...'
-load vmlinux-&linux-mips-version;.gz
+lcd 'Booting &linux-mips64-version;...'
+load vmlinux-&linux-mips64-version;.gz
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
 EOF</userinput></screen>
 
-  <para>Included in <filename class="directory">/usr/lib/colo/examples</filename>
-  are more examples of a <filename>default.colo</filename> file.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(/sect1/para[last()])"/>
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>mkdir /etc/colo &&
-ln -s /boot/colo/default.colo /etc/colo</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/bootable/mips64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/mips64/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/mips64/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
   <primary sortas="a-Linux">Linux</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('package-kernel'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 

Modified: branches/cross-lfs/BOOK/bootable/ppc/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/ppc/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/ppc/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
   <primary sortas="a-Linux">Linux</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('package-kernel'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 

Modified: branches/cross-lfs/BOOK/bootable/sparc/fstab.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/sparc/fstab.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/sparc/fstab.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,10 +14,9 @@
     <primary sortas="e-/etc/fstab">/etc/fstab</primary>
   </indexterm>
 
-  <para>The <filename>/etc/fstab</filename> file is used by some
-  programs to determine where file systems are to be mounted by default,
-  which must be checked, and in which order. Create a new file systems
-  table like this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>cat > /etc/fstab << "EOF"
 <literal># Begin /etc/fstab
@@ -35,27 +34,16 @@
 # End /etc/fstab</literal>
 EOF</userinput></screen>
 
-  <para>Replace <replaceable>[xxx]</replaceable>,
-  <replaceable>[yyy]</replaceable>, and <replaceable>[fff]</replaceable>
-  with the values appropriate for the system, for example, <filename
-  class="partition">hda2</filename>, <filename
-  class="partition">hda5</filename>, and <systemitem
-  class="filesystem">ext2</systemitem>. For details on the six
-  fields in this file, see <command>man 5 fstab</command>.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-  <para>When using a journalling file system, the <parameter>1
-  1</parameter> at the end of the line should be replaced with
-  <parameter>0 0</parameter> because such a partition does not need to
-  be dumped or checked.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-  <para>The <filename class="directory">/dev/shm</filename> mount point
-  for <systemitem class="filesystem">tmpfs</systemitem> is included to
-  allow enabling POSIX-shared memory. The kernel must have the required
-  support built into it for this to work (more about this is in the next
-  section). Please note that very little software currently uses
-  POSIX-shared memory.  Therefore, consider the <filename
-  class="directory">/dev/shm</filename> mount point optional. For more
-  information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
-  in the kernel source tree.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/fstab.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/bootable/sparc/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/sparc/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/sparc/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
     <primary sortas="a-Linux">Linux</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('package-kernel'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 

Modified: branches/cross-lfs/BOOK/bootable/sparc/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/sparc/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/sparc/silo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,11 +15,9 @@
     <secondary>configuring</secondary>
   </indexterm>
 
-  <para>Create a <quote>silo.conf </quote> file defining silo's boot
+  <para>Create a <filename>silo.conf</filename> file defining silo's boot
   menu:</para>
 
-  <para/>
-
 <screen><userinput>cat > /etc/silo.conf << "EOF"
 <literal># Begin /etc/silo.conf
 partition = 1         # Boot partition (= root partition)
@@ -28,9 +26,10 @@
 
 image = /boot/lfskernel-&linux-sparc-version;
   label = linux
-# End /etc/silo.conf</literal></userinput></screen>
+# End /etc/silo.conf</literal>
+EOF</userinput></screen>
 
-   <para>Now to make Silo bootable:</para>
+  <para>Now to make Silo bootable:</para>
 
 <screen><userinput>silo -f</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/bootable/sparc64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/sparc64/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/sparc64/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
     <primary sortas="a-Linux">Linux</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('package-kernel'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 

Added: branches/cross-lfs/BOOK/bootable/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/sparc64/silo.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/sparc64/silo.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -0,0 +1,36 @@
+<?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-silo">
+  <?dbhtml filename="silo.html"?>
+
+  <title>Making the LFS System Bootable</title>
+
+  <indexterm zone="ch-bootable-silo">
+    <primary sortas="a-silo">Silo</primary>
+    <secondary>configuring</secondary>
+  </indexterm>
+
+  <para>Create a <filename>silo.conf</filename> file defining silo's boot
+  menu:</para>
+
+<screen><userinput>cat > /etc/silo.conf << "EOF"
+<literal># Begin /etc/silo.conf
+partition = 1         # Boot partition (= root partition)
+root = /dev/sda1      # Root partition
+timeout = 150         # Wait 15 seconds before booting the default section
+
+image = /boot/lfskernel-&linux-sparc64-version;
+  label = linux
+# End /etc/silo.conf</literal>
+EOF</userinput></screen>
+
+  <para>Now to make Silo bootable:</para>
+
+<screen><userinput>silo -f</userinput></screen>
+
+</sect1>


Property changes on: branches/cross-lfs/BOOK/bootable/sparc64/silo.xml
___________________________________________________________________
Name: svn:keywords
   + "Author Date Revision Id"

Modified: branches/cross-lfs/BOOK/bootable/sparc64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/sparc64-chapter.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/sparc64-chapter.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -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="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="sparc/silo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/bootable/x86/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/x86/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/x86/grub.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -15,34 +15,34 @@
     <secondary>configuring</secondary>
   </indexterm>
 
-  <para>Your shiny new LFS system is almost complete. One of the last
+  <para os="a">Your shiny new LFS system is almost complete. One of the last
   things to do is to ensure that the system can be properly booted. The
   instructions below apply only to computers of IA-32 architecture,
   meaning mainstream PCs. Information on <quote>boot loading</quote> for
   other architectures should be available in the usual resource-specific
   locations for those architectures.</para>
 
-  <para>Boot loading can be a complex area, so a few cautionary words
+  <para os="b">Boot loading can be a complex area, so a few cautionary words
   are in order. Be familiar with the current boot loader and any other
   operating systems present on the hard drive(s) that need to be bootable.
   Make sure that an emergency boot disk is ready to <quote>rescue</quote>
   the computer if the computer becomes unusable (un-bootable).</para>
 
-  <para>Earlier, we compiled and installed the GRUB boot loader software
+  <para os="c">Earlier, we compiled and installed the GRUB boot loader software
   in preparation for this step. The procedure involves writing some special
   GRUB files to specific locations on the hard drive. We highly recommend
   creating a GRUB boot floppy diskette as a backup. Insert a blank floppy
   diskette and run the following commands:</para>
 
-<screen><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+<screen os="d"><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
 dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
-  <para>Remove the diskette and store it somewhere safe. Now, run the
+  <para os="e">Remove the diskette and store it somewhere safe. Now, run the
   <command>grub</command> shell:</para>
 
-<screen><userinput>grub</userinput></screen>
+<screen os="f"><userinput>grub</userinput></screen>
 
-  <para>GRUB uses its own naming structure for drives and partitions in
+  <para os="g">GRUB uses its own naming structure for drives and partitions in
   the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis>
   is the hard drive number and <emphasis>m</emphasis> is the partition
   number, both starting from zero. For example, partition <filename
@@ -54,18 +54,18 @@
   on <filename class="partition">hdc</filename>, that second hard drive
   would still be <emphasis>(hd1)</emphasis>.</para>
 
-  <para>Using the above information, determine the appropriate designator
+  <para os="h">Using the above information, determine the appropriate designator
   for the root partition (or boot partition, if a separate one is used).
   For the following example, it is assumed that the root (or separate boot)
   partition is <filename class="partition">hda4</filename>.</para>
 
-  <para>Tell GRUB where to search for its <filename>stage{1,2}</filename>
+  <para os="i">Tell GRUB where to search for its <filename>stage{1,2}</filename>
   files. The Tab key can be used everywhere to make GRUB show the
   alternatives:</para>
 
-<screen><userinput>root (hd0,3)</userinput></screen>
+<screen os="j"><userinput>root (hd0,3)</userinput></screen>
 
-  <warning>
+  <warning os="k">
     <para>The following command will overwrite the current boot loader.
     Do not run the command if this is not desired, for example, if using
     a third party boot manager to manage the Master Boot Record (MBR).
@@ -74,22 +74,20 @@
     next command would become <userinput>setup (hd0,3)</userinput>.</para>
   </warning>
 
-  <para>Tell GRUB to install itself into the MBR of
+  <para os="l">Tell GRUB to install itself into the MBR of
   <filename class="partition">hda</filename>:</para>
 
-<screen><userinput>setup (hd0)</userinput></screen>
+<screen os="m"><userinput>setup (hd0)</userinput></screen>
 
-  <para>If all went well, GRUB will have reported finding its files in
+  <para os="n">If all went well, GRUB will have reported finding its files in
   <filename class="directory">/boot/grub</filename>. That's all there is
   to it. Quit the <command>grub</command> shell:</para>
 
-<screen><userinput>quit</userinput></screen>
+<screen os="o"><userinput>quit</userinput></screen>
 
-  <para>Create a <quote>menu list</quote> file defining GRUB's boot
+  <para os="p">Create a <quote>menu list</quote> file defining GRUB's boot
   menu:</para>
 
-  <para/>
-
 <screen><userinput>cat > /boot/grub/menu.lst << "EOF"
 <literal># Begin /boot/grub/menu.lst
 
@@ -109,36 +107,34 @@
 EOF</userinput></screen>
 
 
-  <para>Add an entry for the host distribution if desired. It might look
+  <para os="q">Add an entry for the host distribution if desired. It might look
   like this:</para>
 
-<screen><userinput>cat >> /boot/grub/menu.lst << "EOF"
+<screen os="r"><userinput>cat >> /boot/grub/menu.lst << "EOF"
 <literal>title Red Hat
 root (hd0,2)
 kernel /boot/kernel-2.6.5 root=/dev/hda3
 initrd /boot/initrd-2.6.5</literal>
 EOF</userinput></screen>
 
-  <para>If dual-booting Windows, the following entry will allow
+  <para os="s">If dual-booting Windows, the following entry will allow
   booting it:</para>
 
-<screen><userinput>cat >> /boot/grub/menu.lst << "EOF"
+<screen os="t"><userinput>cat >> /boot/grub/menu.lst << "EOF"
 <literal>title Windows
 rootnoverify (hd0,0)
 chainloader +1</literal>
 EOF</userinput></screen>
 
-  <para>If <command>info grub</command> does not provide all necessary
+  <para os="u">If <command>info grub</command> does not provide all necessary
   material, additional information regarding GRUB is located on its
   website at: <ulink url="http://www.gnu.org/software/grub/"/>.</para>
 
-  <para>The FHS stipulates that Bootloader's configuration file should
+  <para os="v">The FHS stipulates that Bootloader's configuration file should
   be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
   To satisfy this requirement for GRUB, issue the following command:</para>
 
-<screen><userinput>mkdir /etc/grub &&
+<screen os="w"><userinput>mkdir /etc/grub &&
 ln -s /boot/grub/menu.lst /etc/grub</userinput></screen>
 
-  <para/>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/bootable/x86/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/x86/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/x86/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -192,7 +192,8 @@
       <segtitle>Installed files</segtitle>
 
       <seglistitem>
-        <seg>kernel, kernel headers, and System.map</seg>
+        <seg>config-[linux-version], lfskernel-[linux-version],
+        and System.map-[linux-version]</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: branches/cross-lfs/BOOK/bootable/x86_64/grub.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/x86_64/grub.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/x86_64/grub.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -14,8 +14,68 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/grub.xml"
-  xpointer="xpointer(/sect1/para[1]/range-to(/sect1/para[11]))"/>
+  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
 
@@ -36,7 +96,30 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/grub.xml"
-  xpointer="xpointer(/sect1/para[12]/range-to(/sect1/para[last()]))"/>
+  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: branches/cross-lfs/BOOK/bootable/x86_64/kernel.xml
===================================================================
--- branches/cross-lfs/BOOK/bootable/x86_64/kernel.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootable/x86_64/kernel.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
     <primary sortas="a-Linux">Linux</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('package-kernel'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(id('package-kernel')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of the kernel</title>
 

Modified: branches/cross-lfs/BOOK/bootscripts/mips/bootscripts.xml
===================================================================
--- branches/cross-lfs/BOOK/bootscripts/mips/bootscripts.xml	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/bootscripts/mips/bootscripts.xml	2005-08-25 18:31:06 UTC (rev 6751)
@@ -16,10 +16,29 @@
     <primary sortas="a-Bootscripts">Bootscripts</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bootscripts.xml"
-  xpointer="xpointer(id('package-bootscripts'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bootscripts.xml"
+    xpointer="xpointer(id('package-bootscripts')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bootscripts.xml"
+    xpointer="xpointer(id('package-bootscripts')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of LFS-Bootscripts</title>
 

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-24 19:24:38 UTC (rev 6750)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-25 18:31:06 UTC (rev 6751)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050824">
+<!ENTITY version "7.0-cross-lfs-20050825">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64">
 <!ENTITY version-ppc "&version;-PowerPC">
@@ -8,7 +8,7 @@
 <!ENTITY version-mips "&version;-MIPS">
 <!ENTITY version-mips64 "&version;-MIPS64">
 
-<!ENTITY releasedate "August 24, 2005">
+<!ENTITY releasedate "August 25, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the lfs-book mailing list