r1628 - in trunk/BOOK: . boot/common boot/x86 bootscripts/common

chris at linuxfromscratch.org chris at linuxfromscratch.org
Wed May 17 11:24:19 PDT 2006


Author: chris
Date: 2006-05-17 12:24:17 -0600 (Wed, 17 May 2006)
New Revision: 1628

Modified:
   trunk/BOOK/boot/common/udev-rules.xml
   trunk/BOOK/boot/x86/grub.xml
   trunk/BOOK/bootscripts/common/udev-rules.xml
   trunk/BOOK/general.ent
Log:
Updated udev-rules instructions to make use of xincludes

Modified: trunk/BOOK/boot/common/udev-rules.xml
===================================================================
--- trunk/BOOK/boot/common/udev-rules.xml	2006-05-17 18:22:50 UTC (rev 1627)
+++ trunk/BOOK/boot/common/udev-rules.xml	2006-05-17 18:24:17 UTC (rev 1628)
@@ -21,12 +21,15 @@
   <sect2 role="installation">
     <title>Installation of Udev-Rules</title>
 
-    <para>When you installed udev, it installed a set of rules, this package
-    replaces these rules. So we must first remove all the old rules sets.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootscripts/common/udev-rules.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>rm -vf ${LFS}/etc/udev/rules.d/*</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../bootscripts/common/udev-rules.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make DESTDIR=${LFS} install-minimal</userinput></screen>
 

Modified: trunk/BOOK/boot/x86/grub.xml
===================================================================
--- trunk/BOOK/boot/x86/grub.xml	2006-05-17 18:22:50 UTC (rev 1627)
+++ trunk/BOOK/boot/x86/grub.xml	2006-05-17 18:24:17 UTC (rev 1628)
@@ -86,8 +86,8 @@
 # Use prettier colors.
 color green/black light-green/black
 
-# The first entry is for LFS.
-title LFS &version;
+# The first entry is for CLFS.
+title CLFS &version;
 root (hd0,3)
 kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/bootscripts/common/udev-rules.xml
===================================================================
--- trunk/BOOK/bootscripts/common/udev-rules.xml	2006-05-17 18:22:50 UTC (rev 1627)
+++ trunk/BOOK/bootscripts/common/udev-rules.xml	2006-05-17 18:24:17 UTC (rev 1628)
@@ -25,14 +25,15 @@
   <sect2 role="installation">
     <title>Installation of Udev-Rules</title>
 
-    <para>When you installed udev, it installed a set of rules. This package
-    replaces these rules. So we must first remove all the old rule sets.</para>
+    <para os="a">When you installed udev, it installed a set of rules. This package
+    replaces these rules. So we must first remove all the old rule
+    sets:</para>
 
-<screen><userinput>rm -vf /etc/udev/rules.d/*</userinput></screen>
+<screen os="b"><userinput>rm -vf /etc/udev/rules.d/*</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="c">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="d"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-05-17 18:22:50 UTC (rev 1627)
+++ trunk/BOOK/general.ent	2006-05-17 18:24:17 UTC (rev 1628)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20060516">
+<!ENTITY version "SVN-20060517">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
 <!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
@@ -15,7 +15,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "May 16, 2006">
+<!ENTITY releasedate "May 17, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the cross-lfs mailing list