* Merged newxml into HEAD

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3435 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 153 insertions, 123 deletions

diff --git a/chapter02/chapter02.xml b/chapter02/chapter02.xml
index e1e6e74ec..29d349029 100644
--- a/chapter02/chapter02.xml
+++ b/chapter02/chapter02.xml
@@ -1,135 +1,24 @@
-<chapter id="chapter-making-space" xreflabel="Chapter 2">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<chapter id="chapter-partitioning" xreflabel="Chapter 2">
+<?dbhtml dir="chapter02"?>
 <title>Preparing a new partition</title>
-<?dbhtml filename="chapter02.html" dir="chapter02"?>
+<?dbhtml filename="chapter02.html"?>
 
 
-<sect1 id="space-introduction">
-<title>Introduction</title>
-<?dbhtml filename="introduction.html" dir="chapter02"?>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction.xml"/>
 
-<para>In this chapter the partition which will host the LFS system is
-prepared. We will create the partition itself, make a file system on it,
-and mount it.</para>
 
-</sect1>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingpartition.xml"/>
 
 
-<sect1 id="space-creatingpartition">
-<title>Creating a new partition</title>
-<?dbhtml filename="creatingpartition.html" dir="chapter02"?>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingfilesystem.xml"/>
 
-<para>In order to build our new Linux system, we will need some space:
-an empty disk partition. If you don't have a free partition, and no room
-on any of your hard disks to make one, then you could build LFS on the
-same partition as the one on which your current distribution is installed.
-This procedure is not recommended for your first LFS install, but if you
-are short on disk space, and you feel brave, take a look at the hint at
-<ulink url="&hints-root;lfs_next_to_existing_systems.txt"/>.</para>
 
-<para>For a minimal system you will need a partition of around 1.2 GB.
-This is enough to store all the source tarballs and compile all the packages.
-But if you intend to use the LFS system as your primary Linux system, you
-will probably want to install additional software, and will need more space
-than this, probably around 2 or 3 GB.</para>
-
-<para>As we almost never have enough RAM in our box, it is a good idea to
-use a small disk partition as swap space -- this space is used by the kernel
-to store seldom-used data to make room in memory for more urgent stuff.
-The swap partition for your LFS system can be the same one as for your host
-system, so you won't have to create another if your host system already uses
-a swap partition.</para>
-
-<para>Start a disk partitioning program such as <command>cfdisk</command>
-or <command>fdisk</command> with an argument naming the hard disk upon
-which the new partition must be created -- for example
-<filename>/dev/hda</filename> for the primary IDE disk. Create a Linux native
-partition and a swap partition, if needed. Please refer to the man pages of
-<command>cfdisk</command> or <command>fdisk</command> if you don't yet
-know how to use the programs.</para>
-
-<para>Remember the designation of your new partition -- something like
-<filename>hda5</filename>. This book will refer to it as the LFS partition.
-If you (now) also have a swap partition, remember its designation too. These
-names will later be needed for the <filename>/etc/fstab</filename> file.</para>
-
-</sect1>
-
-
-<sect1 id="space-creatingfilesystem">
-<title>Creating a file system on the new partition</title>
-<?dbhtml filename="creatingfilesystem.html" dir="chapter02"?>
-
-<para>Now that we have a blank partition, we can create a file system on it.
-Most widely used in the Linux world is the second extended file system (ext2),
-but with the high-capacity hard disks of today the so-called journaling
-file systems are becoming increasingly popular. Here we will create an ext2
-file system, but build instructions for other file systems can be found at
-<ulink url="&blfs-root;view/stable/postlfs/filesystems.html"/>.</para>
-
-<para>To create an ext2 file system on the LFS partition run the following:</para>
-
-<screen><userinput>mke2fs /dev/xxx</userinput></screen>
-
-<para>Replace <filename>xxx</filename> with the name of the LFS partition
-(something like <filename>hda5</filename>).</para>
-
-<para>If you created a (new) swap partition you need to initialize it as a
-swap partition too (also known as formatting, like you did above with
-<command>mke2fs</command>) by running:</para>
-
-<screen><userinput>mkswap /dev/yyy</userinput></screen>
-
-<para>Replace <filename>yyy</filename> with the name of the swap
-partition.</para>
-
-</sect1>
-
-
-<sect1 id="space-mounting">
-<title>Mounting the new partition</title>
-<?dbhtml filename="mounting.html" dir="chapter02"?>
-
-<para>Now that we've created a file system, we want to be able to access
-the partition. For that, we need to mount it, and have to choose a mount
-point. In this book we assume that the file system is mounted under
-<filename>/mnt/lfs</filename>, but it doesn't matter what directory
-you choose.</para>
-
-<para>Choose a mount point and assign it to the LFS environment variable
-by running:</para>
-
-<screen><userinput>export LFS=/mnt/lfs</userinput></screen>
-
-<para>Now create the mount point and mount the LFS file system by running:</para>
-
-<screen><userinput>mkdir -p $LFS
-mount /dev/xxx $LFS</userinput></screen>
-
-<para>Replace <filename>xxx</filename> with the designation of the LFS
-partition.</para>
-
-<para>If you have decided to use multiple partitions for LFS (say one for
-<filename>/</filename> and another for <filename>/usr</filename>), mount
-them like this:</para>
-
-<screen><userinput>mkdir -p $LFS
-mount /dev/xxx $LFS
-mkdir $LFS/usr
-mount /dev/yyy $LFS/usr</userinput></screen>
-
-<para>Of course, replace <filename>xxx</filename> and <filename>yyy</filename>
-with the appropriate partition names.</para>
-
-<para>You should also ensure that this new partition is not mounted with
-permissions that are too restrictive (such as the nosuid, nodev or noatime
-options). You can run the <command>mount</command> command without any
-parameters to see with what options the LFS partition is mounted. If
-you see nosuid, nodev or noatime, you will need to remount it.</para>
- 
-<para>Now that we've made ourselves a place to work in, we're ready to download
-the packages.</para>
-
-</sect1>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mounting.xml"/>
 
 
 </chapter>
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
new file mode 100644
index 000000000..3745679b8
--- /dev/null
+++ b/chapter02/creatingfilesystem.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="space-creatingfilesystem">
+<title>Creating a file system on the new partition</title>
+<?dbhtml filename="creatingfilesystem.html"?>
+
+<para>Now that we have a blank partition, we can create a file system on it.
+Most widely used in the Linux world is the second extended file system (ext2),
+but with the high-capacity hard disks of today the so-called journaling file
+systems are becoming increasingly popular. Here we will create an ext2 file
+system, but build instructions for other file systems can be found at 
+<ulink url="&blfs-root;view/stable/postlfs/filesystems.html"/>.</para>
+
+<para>To create an ext2 file system on the LFS partition run the following:</para>
+
+<screen><userinput>mke2fs /dev/xxx</userinput></screen>
+
+<para>Replace <filename>xxx</filename> with the name of the LFS partition
+(something like <filename>hda5</filename>).</para>
+
+<para>If you created a (new) swap partition you need to initialize it as a
+swap partition too (also known as formatting, like you did above with
+<userinput>mke2fs</userinput>) by running:</para>
+
+<screen><userinput>mkswap /dev/yyy</userinput></screen>
+
+<para>Replace <filename>yyy</filename> with the name of the swap
+partition.</para>
+
+</sect1>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
new file mode 100644
index 000000000..fd317876e
--- /dev/null
+++ b/chapter02/creatingpartition.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="space-creatingpartition">
+<title>Creating a new partition</title>
+<?dbhtml filename="creatingpartition.html"?>
+
+<para>In order to build our new Linux system, we will need some space:
+an empty disk partition. If you don't have a free partition, and no room
+on any of your hard disks to make one, then you could build LFS on the
+same partition as the one on which your current distribution is installed.
+This procedure is not recommended for your first LFS install, but if you
+are short on disk space, and you feel brave, take a look at the hint at
+<ulink url="&hints-root;lfs_next_to_existing_systems.txt"/>.</para>
+
+<para>For a minimal system you will need a partition of around 1.3 GB.
+This is enough to store all the source tarballs and compile all the packages.
+But if you intend to use the LFS system as your primary Linux system, you
+will probably want to install additional software, and will need more space
+than this, probably around 2 or 3 GB.</para>
+
+<para>As we almost never have enough RAM in our box, it is a good idea to
+use a small disk partition as swap space -- this space is used by the kernel
+to store seldom-used data to make room in memory for more urgent stuff.
+The swap partition for your LFS system can be the same one as for your host
+system, so you won't have to create another if your host system already uses
+a swap partition.</para>
+
+<para>Start a disk partitioning program such as <userinput>cfdisk</userinput>
+or <userinput>fdisk</userinput> with an argument naming the hard disk upon
+which the new partition must be created -- for example
+<filename>/dev/hda</filename> for the primary IDE disk. Create a Linux native
+partition and a swap partition, if needed. Please refer to the man pages of
+<userinput>cfdisk</userinput> or <userinput>fdisk</userinput> if you don't yet
+know how to use the programs.</para>
+
+<para>Remember the designation of your new partition -- something like
+<filename>hda5</filename>. This book will refer to it as the LFS partition.
+If you (now) also have a swap partition, remember its designation too. These
+names will later be needed for the <filename>/etc/fstab</filename> file.</para>
+
+</sect1>
diff --git a/chapter02/introduction.xml b/chapter02/introduction.xml
new file mode 100644
index 000000000..f1609dab9
--- /dev/null
+++ b/chapter02/introduction.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="space-introduction">
+<title>Introduction</title>
+<?dbhtml filename="introduction.html"?>
+
+<para>In this chapter the partition which will host the LFS system is
+prepared. We will create the partition itself, make a file system on it,
+and mount it.</para>
+
+</sect1>
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
new file mode 100644
index 000000000..610ccf652
--- /dev/null
+++ b/chapter02/mounting.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="space-mounting">
+<title>Mounting the new partition</title>
+<?dbhtml filename="mounting.html"?>
+
+<para>Now that we've created a file system, we want to be able to access
+the partition. For that, we need to mount it, and have to choose a mount
+point. In this book we assume that the file system is mounted under
+<filename>/mnt/lfs</filename>, but it doesn't matter what directory
+you choose.</para>
+
+<para>Choose a mount point and assign it to the LFS environment variable
+by running:</para>
+
+<screen><userinput>export LFS=/mnt/lfs</userinput></screen>
+
+<para>Now create the mount point and mount the LFS file system by running:</para>
+
+<screen><userinput>mkdir -p $LFS
+mount /dev/xxx $LFS</userinput></screen>
+
+<para>Replace <filename>xxx</filename> with the designation of the LFS
+partition.</para>
+
+<para>If you have decided to use multiple partitions for LFS (say one for
+<filename>/</filename> and another for <filename>/usr</filename>), mount
+them like this:</para>
+
+<screen><userinput>mkdir -p $LFS
+mount /dev/xxx $LFS
+mkdir $LFS/usr
+mount /dev/yyy $LFS/usr</userinput></screen>
+
+<para>Of course, replace <filename>xxx</filename> and <filename>yyy</filename>
+with the appropriate partition names.</para>
+
+<para>You should also ensure that this new partition is not mounted with
+permissions that are too restrictive (such as the nosuid, nodev or noatime
+options). You can run the <command>mount</command> command without any
+parameters to see with what options the LFS partition is mounted. If
+you see nosuid, nodev or noatime, you will need to remount it.</para>
+ 
+<para>Now that we've made ourselves a place to work in, we're ready to download
+the packages.</para>
+
+</sect1>