Changeset f1fd69a for boot/x86

Timestamp:

Jul 1, 2006, 11:52:01 PM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

6ea30c8

Parents:

b18d234

Message:

r4227@server: jim | 2006-07-01 23:46:16 -0700
More LFS to CLFS Updates

Location:

boot/x86

Files:

• grub-build.xml (modified) (2 diffs)
• grub.xml (modified) (5 diffs)
• kernel.xml (modified) (5 diffs)

boot/x86/grub-build.xml

@@ -54 +54 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install
-mkdir -v ${LFS}/boot/grub
-cp -v ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install
+mkdir -v ${CLFS}/boot/grub
+cp -v ${CLFS}/usr/lib/grub/i386-pc/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
 
     <para os="ac">The <filename class="directory">i386-pc</filename> directory
@@ -62 +62 @@
     ones for different file systems. Review the files available and copy
     the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most users will
+    class="directory">${CLFS}/boot/grub</filename> directory. Most users will
     copy the <filename>e2fs_stage1_5</filename> and/or
     <filename>reiserfs_stage1_5</filename> files.</para>

boot/x86/grub.xml

@@ -24 +24 @@
   xpointer="xpointer(//*[@os='c'])"/>
 
-<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>
+<screen os="d"><userinput>dd if=${CLFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+dd if=${CLFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -64 +64 @@
 
   <para os="n">If all went well, GRUB will have reported finding its files
-  in <filename class="directory">${LFS}/boot/grub</filename>. That's
+  in <filename class="directory">${CLFS}/boot/grub</filename>. That's
   all there is to it. Quit the <command>grub</command> shell:</para>
 
@@ -75 +75 @@
   xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>cat &gt; ${LFS}/boot/grub/menu.lst &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/boot/grub/menu.lst &lt;&lt; "EOF"
 <literal># Begin /boot/grub/menu.lst
 
@@ -90 +90 @@
 title CLFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
+kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
@@ -97 +97 @@
   xpointer="xpointer(//*[@os='q'])"/>
 
-<screen os="r"><userinput>cat &gt;&gt; ${LFS}/boot/grub/menu.lst &lt;&lt; "EOF"
+<screen os="r"><userinput>cat &gt;&gt; ${CLFS}/boot/grub/menu.lst &lt;&lt; "EOF"
 <literal>title Red Hat
 root (hd0,2)

boot/x86/kernel.xml

@@ -72 +72 @@
 
     <para os="af">If the use of kernel modules can't be avoided, an
-    <filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
+    <filename>${CLFS}/etc/modprobe.conf</filename> file may be needed.
     Information pertaining to modules and kernel configuration is
     located in the kernel documentation in the <filename
@@ -92 +92 @@
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <para os="u">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${LFS}/boot</filename> directory.</para>
+    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -102 +102 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -108 +108 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="w1"><userinput>cp -v System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -114 +114 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp -v .config ${LFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
 
   </sect2>