aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/makedev-dep.xml2
-rw-r--r--appendixa/makedev-shortdesc.xml14
-rw-r--r--chapter06/makedev-exp.xml13
-rw-r--r--chapter06/makedev-inst.xml41
-rw-r--r--chapter06/makedev.xml5
-rw-r--r--entities/makedev.ent2
6 files changed, 44 insertions, 33 deletions
diff --git a/appendixa/makedev-dep.xml b/appendixa/makedev-dep.xml
index 27a7cc439..668abbbe9 100644
--- a/appendixa/makedev-dep.xml
+++ b/appendixa/makedev-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>MAKEDEV Installation Dependencies</title>
diff --git a/appendixa/makedev-shortdesc.xml b/appendixa/makedev-shortdesc.xml
new file mode 100644
index 000000000..bf5b98428
--- /dev/null
+++ b/appendixa/makedev-shortdesc.xml
@@ -0,0 +1,14 @@
+<sect2><title>Contents of MAKEDEV</title>
+
+<para>Last checked against version &makedev-contversion;.</para>
+
+<para>The MAKEDEV script creates the static device nodes which
+usually reside in the <filename class="directory">/dev</filename>
+directory. Detailed information about device nodes may be found
+in the <filename>Documentation/devices.txt</filename> file under
+the Linux kernel source tree.</para>
+
+<sect3><title>Program Files</title>
+<para>MAKEDEV</para></sect3>
+
+</sect2>
diff --git a/chapter06/makedev-exp.xml b/chapter06/makedev-exp.xml
deleted file mode 100644
index f41589da6..000000000
--- a/chapter06/makedev-exp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>./MAKEDEV -v generic:</userinput> This creates a whole
-bunch of devices. Normally, these are all the devices you will need. But it
-is possible that some special devices needed for your hardware configuration
-are missing. Create these with ./MAKEDEV -v &lt;device&gt;.
-The <userinput>generic-nopty</userinput> option mostly creates the same
-devices as <userinput>generic</userinput>, but skips those that aren't
-needed if you are using devpts.</para>
-
-</sect2>
-
diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml
index d9ec9b784..bd35924d3 100644
--- a/chapter06/makedev-inst.xml
+++ b/chapter06/makedev-inst.xml
@@ -1,30 +1,39 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Creating devices</title>
-<para>Note that unpacking the MAKEDEV-&makedev-version;.bz2 file doesn't create
-a directory for you to cd into, as the file only contains a script.</para>
+<para>Please note that unpacking the MAKEDEV-&makedev-version;.bz2 file
+doesn't create a directory for you to <userinput>cd</userinput> into, as
+the file contains one shell script.</para>
+
+<para>Install the MAKEDEV script:</para>
-<para>Prepare for the creation of the device files by running the
-following commands:</para>
+<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV</userinput></screen></para>
-<para><screen><userinput>cp MAKEDEV-&makedev-version; /dev/MAKEDEV &amp;&amp;
-cd /dev &amp;&amp;
+<para>Prepare the script for execution:</para>
+
+<para><screen><userinput>cd /dev &amp;&amp;
chmod 754 MAKEDEV</userinput></screen></para>
-<para>Most people will now want to create devices by running:</para>
+<para>Run the script to create the device files:</para>
+
<para><screen><userinput>./MAKEDEV -v generic</userinput></screen></para>
-<para>But if you intend to use devpts, then run this instead:</para>
-<para><screen><userinput>./MAKEDEV -v generic-nopty</userinput></screen></para>
+<para>If a device you need is missing, try running
+<userinput>./MAKEDEV -v &lt;device&gt;</userinput>. Alternatively, you may
+create devices via the <emphasis>mknod</emphasis> program. Please refer to
+the man and info pages of <emphasis>mknod</emphasis> if you need more
+information.</para>
-<para>Note that if you aren't sure, it's best to use the
-<userinput>./MAKEDEV -v generic</userinput> command as this will ensure you
-have all the devices you need. But if you are certain you are going to use
-devpts, the other command skips creating a set of devices you won't need.</para>
+<para>If you intend to use devpts, pass the
+<userinput>generic-nopty</userinput> option to <filename>MAKEDEV</filename>.
+This creates the same devices as <userinput>generic</userinput>, but it skips
+the creation of pty devices so that devpts can manage them itself.</para>
-<para><filename>MAKEDEV</filename> will create hda[1-20] to hdh[1-20] and
-many more of such disk device nodes, but keep in mind that you probably won't
-be able to use all of these, due to kernel limits on the maximum number of
+<para><filename>MAKEDEV</filename> will create devices ranging from hda[1-20]
+to hdh[1-20] and beyond, but keep in mind that you probably won't be able to
+use all of these due to kernel limits on the maximum number of
partitions.</para>
</sect2>
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index 158d7c879..e7005e574 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -5,10 +5,9 @@
<screen>Estimated build time: &makedev-time;
Estimated required disk space: &makedev-compsize;</screen>
-&c6-makedev-inst;
-&c6-makedev-exp;
-&aa-makedev-desc;
+&aa-makedev-shortdesc;
&aa-makedev-dep;
+&c6-makedev-inst;
</sect1>
diff --git a/entities/makedev.ent b/entities/makedev.ent
index 783d3e17c..a9c64074f 100644
--- a/entities/makedev.ent
+++ b/entities/makedev.ent
@@ -2,12 +2,12 @@
<!ENTITY c6-makedev SYSTEM "../chapter06/makedev.xml">
<!ENTITY c6-makedev-inst SYSTEM "../chapter06/makedev-inst.xml">
-<!ENTITY c6-makedev-exp SYSTEM "../chapter06/makedev-exp.xml">
<!ENTITY aa-makedev SYSTEM "../appendixa/makedev.xml">
<!ENTITY aa-makedev-desc SYSTEM "../appendixa/makedev-desc.xml">
<!ENTITY aa-makedev-dep SYSTEM "../appendixa/makedev-dep.xml">
<!ENTITY aa-makedev-down SYSTEM "../appendixa/makedev-down.xml">
+<!ENTITY aa-makedev-shortdesc SYSTEM "../appendixa/makedev-shortdesc.xml">
<!ENTITY makedev-version "1.7">
<!ENTITY makedev-depversion "1.5">