diff options
| author | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2005-01-30 12:51:22 +0000 |
|---|---|---|
| committer | Manuel Canales Esparcia <manuel@linuxfromscratch.org> | 2005-01-30 12:51:22 +0000 |
| commit | d72e04ae7c868b734e3ad39982b169c71444f541 (patch) | |
| tree | 8009bd8eb42c8b44e5c78decfd41c579e74a2c3b | |
| parent | bce08efc719e0824225490272cefa848a2313b24 (diff) | |
Added <literal> tags.
Added NEW comments to commands that differs from testing.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4599 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
33 files changed, 110 insertions, 94 deletions
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml index 9f67ae74d..73006ea42 100644 --- a/chapter04/settingenviron.xml +++ b/chapter04/settingenviron.xml @@ -8,16 +8,16 @@ <?dbhtml filename="settingenvironment.html"?> <screen><userinput>cat > ~/.bash_profile << "EOF" -exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash +<literal>exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash</literal> EOF</userinput></screen> <screen><userinput>cat > ~/.bashrc << "EOF" -set +h +<literal>set +h umask 022 LFS=/mnt/lfs LC_ALL=POSIX PATH=/tools/bin:/bin:/usr/bin -export LFS LC_ALL PATH +export LFS LC_ALL PATH</literal> EOF</userinput></screen> <screen><userinput>source ~/.bash_profile</userinput></screen> diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index 473d895d9..12da057ac 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -32,7 +32,8 @@ readelf -l a.out | grep ': /tools'</userinput></screen> <para>The output of the last command will be of the form:</para> -<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen> +<screen><computeroutput>[Requesting program interpreter: + /tools/lib/ld-linux.so.2]</computeroutput></screen> <para>Remove the test files:</para> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index fa8c23f2e..8d891918e 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -32,7 +32,8 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools --disable-nls</userinput></screen> +<screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \ + --disable-nls</userinput></screen> <para>Continue with compiling the package:</para> diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 9c79ecf2c..21c890903 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -36,6 +36,7 @@ cd ../binutils-build</userinput></screen> <para>Test the results:</para> +<!-- NEW --> <screen><userinput>make -k check</userinput></screen> <para>Except for a few known failures, the binutils tests should all pass. The @@ -44,6 +45,7 @@ exceptions to this rule are as follows:</para> <screen><computeroutput>* 5 FAIL (unexpected failure) for visibility * 1 FAIL for selective4 * 1 FAIL for selective5</computeroutput></screen> +<!-- END NEW--> <para>And install the package:</para> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index c878bd4b2..8f041f7fe 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -27,6 +27,7 @@ cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> +<!--NEW--> <screen><userinput>CC="gcc -B/usr/bin" ../gcc-&gcc-version;/configure \ --prefix=/tools --libexecdir=/tools/lib \ --with-local-prefix=/tools --disable-nls \ diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 61bd3e9b6..314727252 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -38,9 +38,9 @@ cd ../gcc-build</userinput></screen> <screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \ --libexecdir=/tools/lib --with-local-prefix=/tools \ - --enable-clocale=gnu --enable-shared --enable-threads=posix \ - --enable-__cxa_atexit --enable-languages=c,c++ \ - --disable-libstdcxx-pch</userinput></screen> + --enable-clocale=gnu --enable-shared \ + --enable-threads=posix --enable-__cxa_atexit \ + --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index 197b51d3b..f6d78b896 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -33,7 +33,8 @@ cd ../binutils-build</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen> +<screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \ + --enable-shared</userinput></screen> <para>Compile the package:</para> @@ -41,6 +42,7 @@ cd ../binutils-build</userinput></screen> <para>Test the results:</para> +<!--NEW--> <screen><userinput>make -k check</userinput></screen> <para>The test suite notes from <xref linkend="ch-tools-binutils-pass2"/> are still diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 57a6f0424..4863dffe0 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -28,7 +28,8 @@ <para>Apply another patch:</para> -<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen> +<screen><userinput>patch -Np1 -i \ + ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen> <para>Now prepare Coreutils for compilation:</para> @@ -63,10 +64,9 @@ echo "dummy:x:1000:1000:::/bin/bash" >> /etc/passwd</userinput></screen> <para>And move some programs to their proper locations:</para> <screen><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin -mv /usr/bin/{date,echo,false,head,install,ln,ls} /bin -mv /usr/bin/{mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin +mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin +mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin -mv /usr/bin/hostname /bin mv /usr/bin/chroot /usr/sbin</userinput></screen> <para>Create a symlink:</para> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 24be45365..e69ad90bf 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -51,14 +51,14 @@ <para>Create a lex script:</para> -<screen><userinput>cat > /usr/bin/lex << "EOF"</userinput> -#!/bin/sh +<screen><userinput>cat > /usr/bin/lex << "EOF" +<literal>#!/bin/sh # Begin /usr/bin/lex exec /usr/bin/flex -l "$@" -# End /usr/bin/lex -<userinput>EOF +# End /usr/bin/lex</literal> +EOF chmod 755 /usr/bin/lex</userinput></screen> </sect2> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 71eda302d..c48378f67 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -42,8 +42,9 @@ cd ../gcc-build</userinput></screen> <para>Now prepare GCC for compilation:</para> <screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \ - --libexecdir=/usr/lib --enable-shared --enable-threads=posix \ - --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++</userinput></screen> + --libexecdir=/usr/lib --enable-shared \ + --enable-threads=posix --enable-__cxa_atexit \ + --enable-clocale=gnu --enable-languages=c,c++</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index be6a4935a..808789744 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -93,7 +93,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen> following:</para> <screen><userinput>cat > /etc/nsswitch.conf << "EOF" -# Begin /etc/nsswitch.conf +<literal># Begin /etc/nsswitch.conf passwd: files group: files @@ -107,7 +107,7 @@ services: files ethers: files rpc: files -# End /etc/nsswitch.conf +# End /etc/nsswitch.conf</literal> EOF</userinput></screen> <para>To find out what time zone you're in, run the following script:</para> @@ -129,12 +129,12 @@ EOF</userinput></screen> following:</para> <screen><userinput>cat > /etc/ld.so.conf << "EOF" -# Begin /etc/ld.so.conf +<literal># Begin /etc/ld.so.conf /usr/local/lib /opt/lib -# End /etc/ld.so.conf +# End /etc/ld.so.conf</literal> EOF</userinput></screen> </sect2> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 38d4ea099..1d1a48fef 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -31,6 +31,7 @@ <screen><userinput>patch -Np1 -i ../iproute2-&iproute2-patch-version;-remove_db-1.patch</userinput></screen> + <!--NEW--> <para>The patch below fixes the issue with the newer versions of findutils, the issue will give an error message it options are not in the proper order. This patch corrects this issue for IPRoute2.</para> @@ -46,7 +47,8 @@ <screen><userinput>make SBINDIR=/sbin</userinput></screen> <para>Now install it:</para> - + + <!--NEW--> <screen><userinput>make install SBINDIR=/sbin</userinput></screen> </sect2> diff --git a/chapter06/libol.xml b/chapter06/libol.xml index d601466db..dd38ae894 100644 --- a/chapter06/libol.xml +++ b/chapter06/libol.xml @@ -24,6 +24,7 @@ <para>Prepare Libol for compilation</para> +<!--NEW--> <screen><userinput>./configure --prefix=/usr</userinput></screen> <para>Compile Libol:</para> diff --git a/chapter06/man.xml b/chapter06/man.xml index 1d88e3fd1..39241b958 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -42,6 +42,8 @@ <screen><userinput>make install</userinput></screen> +<para>For some internazionalitation issues, see testing.</para> + </sect2> diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml index a2c6d98ff..f52de7043 100644 --- a/chapter06/pwdgroup.xml +++ b/chapter06/pwdgroup.xml @@ -10,13 +10,13 @@ <para>Create the <filename>/etc/passwd</filename> file:</para> <screen><userinput>cat > /etc/passwd << "EOF" -root:x:0:0:root:/root:/bin/bash +<literal>root:x:0:0:root:/root:/bin/bash</literal> EOF</userinput></screen> <para>Create the <filename>/etc/group</filename> file:</para> <screen><userinput>cat > /etc/group << "EOF" -root:x:0: +<literal>root:x:0: bin:x:1: sys:x:2: kmem:x:3: @@ -30,7 +30,7 @@ dialout:x:10: audio:x:11: video:x:12: utmp:x:13: -usb:x:14: +usb:x:14:</literal> EOF</userinput></screen> <para>Start a new shell:</para> diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml index 61b2fe9c8..6b9b61619 100644 --- a/chapter06/readjusting.xml +++ b/chapter06/readjusting.xml @@ -4,7 +4,7 @@ %general-entities; ]> <sect1 id="ch-system-readjusting"> -<title>Rea-djusting the Toolchain</title> +<title>Re-adjusting the Toolchain</title> <?dbhtml filename="readjusting.html"?> <para>Install the adjusted linker by running the following from within the @@ -14,11 +14,9 @@ <para>Amend the GCC specs file:</para> -<!-- Ampersands are needed to allow cut and paste --> - <screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g;' \ -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/@g;' \ - `gcc --print-file specs`</userinput></screen> + `gcc --print-file specs`</userinput></screen> <caution><para>Perform a simple sanity check:</para> diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 3a2910f7d..3e82cbfc2 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -22,6 +22,7 @@ <sect2 role="installation"> <title>Installation of Readline</title> +<!-- NEW set of commands--> <para>Apply a patch.</para> <screen><userinput>patch -Np1 -i ../readline-&readline-version;-fixes-1.patch</userinput></screen> diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 238de4345..ae11d8c31 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -53,13 +53,10 @@ sed -i '/groups/d' man/Makefile</userinput></screen> <screen><userinput>mv /usr/bin/passwd /bin</userinput></screen> -<para>Move a library:</para> +<para>Move the library:</para> -<screen><userinput>mv /lib/libshadow.*a /usr/lib</userinput></screen> - -<para>Create the following symlinks:</para> - -<screen><userinput>rm /lib/libshadow.so +<screen><userinput>mv /lib/libshadow.*a /usr/lib +rm /lib/libshadow.so ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> <para>Create a dir:</para> diff --git a/chapter06/syslogng.xml b/chapter06/syslogng.xml index 6af059199..f4b3bbb92 100644 --- a/chapter06/syslogng.xml +++ b/chapter06/syslogng.xml @@ -43,7 +43,7 @@ <screen><userinput>mkdir -p /etc/syslog-ng cat > /etc/syslog-ng/syslog-ng.conf << "EOF" -# Begin /etc/syslog-ng/syslog-ng.conf +<literal># Begin /etc/syslog-ng/syslog-ng.conf options { sync (0); time_reopen (10); @@ -114,7 +114,7 @@ log { source(src); filter(f_emergency); destination(console); }; log { source(src); filter(f_everything); destination(everything); }; log { source(src); destination(console_all); }; -# END /etc/syslog-ng/syslog-ng.conf +# END /etc/syslog-ng/syslog-ng.conf</literal> EOF</userinput></screen> </sect2> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index 34f59ff95..3860d1188 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -43,7 +43,7 @@ <para>Create a <filename>/etc/inittab</filename> file:</para> <screen><userinput>cat > /etc/inittab << "EOF" -# Begin /etc/inittab +<literal># Begin /etc/inittab id:3:initdefault: @@ -68,7 +68,7 @@ su:S016:once:/sbin/sulogin 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600 -# End /etc/inittab +# End /etc/inittab</literal> EOF</userinput></screen> </sect2> diff --git a/chapter06/udev.xml b/chapter06/udev.xml index 5d8cf5351..75a3232b1 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -32,7 +32,8 @@ <para>Install our configuration files:</para> -<screen><userinput>cp ../udev-config-2.permissions /etc/udev/permissions.d/25-lfs.permissions +<screen><userinput>cp ../udev-config-2.permissions \ + /etc/udev/permissions.d/25-lfs.permissions cp ../udev-config-1.rules /etc/udev/rules.d/25-lfs.rules</userinput></screen> <para>Create the full compliment of device nodes:</para> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 3e1ca3082..2ef51e632 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -24,7 +24,8 @@ <para>Issue a sed sustitution:</para> -<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' hwclock/hwclock.c +<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ + hwclock/hwclock.c mkdir -p /var/lib/hwclock</userinput></screen> </sect2> diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 537176681..2732e9fd2 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -60,7 +60,7 @@ following patch fixes the problem:</para> the following:</para> <screen><userinput>cat > /etc/vimrc << "EOF" -" Begin /etc/vimrc +<literal>" Begin /etc/vimrc set nocompatible set backspace=2 @@ -70,7 +70,7 @@ if (&term == "iterm") || (&term == "putty") set background=dark endif -" End /etc/vimrc +" End /etc/vimrc</literal> EOF</userinput></screen> <!-- XXX: the ascii-only files are considered to be in utf-8 - that's not what diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index 80c58029c..1bd923cd3 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -22,6 +22,7 @@ <sect2 role="installation"> <title>Installation of Zlib</title> +<!-- NEW set of commands--> <para>Prepare Zlib for compilation:</para> <screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen> diff --git a/chapter07/console.xml b/chapter07/console.xml index 878e657b1..debeba00b 100644 --- a/chapter07/console.xml +++ b/chapter07/console.xml @@ -10,28 +10,28 @@ <para>Create the configuration file:</para> <screen><userinput>cat >/etc/sysconfig/console <<"EOF" -KEYMAP="<replaceable>[arguments for loadkeys]</replaceable>" -FONT="<replaceable>[arguments for setfont]</replaceable>" +<literal>KEYMAP="<replaceable>[arguments for loadkeys]</replaceable>" +FONT="<replaceable>[arguments for setfont]</replaceable>"</literal> EOF</userinput></screen> <para>If you see that keycode 14 is Backspace and not Delete, create the following keymap snippet to fix this issue:</para> -<screen><userinput>mkdir -p /etc/kbd && cat >/etc/kbd/bs-sends-del <<"EOF" - keycode 14 = Delete Delete Delete Delete - alt keycode 14 = Meta_Delete -altgr alt keycode 14 = Meta_Delete - keycode 111 = Remove -altgr control keycode 111 = Boot -control alt keycode 111 = Boot -altgr control alt keycode 111 = Boot +<screen><userinput>mkdir -p /etc/kbd && cat > /etc/kbd/bs-sends-del <<"EOF" +<literal> keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + altgr alt keycode 14 = Meta_Delete + keycode 111 = Remove + altgr control keycode 111 = Boot + control alt keycode 111 = Boot +altgr control alt keycode 111 = Boot</literal> EOF</userinput></screen> <para>Then tell the <command>console</command> script to load this snippet after the main keymap:</para> <screen><userinput>cat >>/etc/sysconfig/console <<"EOF" -KEYMAP_CORRECTION="/etc/kbd/bs-sends-del" +<literal>KEYMAP_CORRECTION="/etc/kbd/bs-sends-del"</literal> EOF</userinput></screen> </sect1> diff --git a/chapter07/hosts.xml b/chapter07/hosts.xml index 5f58fe0fe..dda1de2b9 100644 --- a/chapter07/hosts.xml +++ b/chapter07/hosts.xml @@ -7,27 +7,27 @@ <title>Creating the /etc/hosts File</title> <?dbhtml filename="hosts.html"?> -<para>If a network card is not going to be configured, create the +<para>If a network card is to be configured, create the <filename>/etc/hosts</filename> file by running:</para> <screen><userinput>cat > /etc/hosts << "EOF" -# Begin /etc/hosts (no network card version) +<literal># Begin /etc/hosts (network card version) -127.0.0.1 <replaceable>[<value of HOSTNAME>.example.org]</replaceable> <replaceable>[value of HOSTNAME]</replaceable> localhost +127.0.0.1 localhost +<replaceable>[192.168.1.1]</replaceable> <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> -# End /etc/hosts (no network card version) +# End /etc/hosts (network card version)</literal> EOF</userinput></screen> -<para>If a network card is to be configured, create the +<para>If a network card is not going to be configured, create the <filename>/etc/hosts</filename> file by running:</para> <screen><userinput>cat > /etc/hosts << "EOF" -# Begin /etc/hosts (network card version) +<literal># Begin /etc/hosts (no network card version) -127.0.0.1 localhost -<replaceable>[192.168.1.1]</replaceable> <replaceable>[<value of HOSTNAME>.example.org]</replaceable> <replaceable>[value of HOSTNAME]</replaceable> +127.0.0.1 <replaceable>[<HOSTNAME>.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost -# End /etc/hosts (network card version) +# End /etc/hosts (no network card version)</literal> EOF</userinput></screen> </sect1> diff --git a/chapter07/inputrc.xml b/chapter07/inputrc.xml index 4011cd91f..8d5e6ed9e 100644 --- a/chapter07/inputrc.xml +++ b/chapter07/inputrc.xml @@ -10,7 +10,8 @@ <para>Create the /etc/inputrc file:</para> <screen><userinput>cat > /etc/inputrc << "EOF" -# Begin /etc/inputrc +<literal># Begin /etc/inputrc +# Modified by Chris Lynn <roryo@roryo.dynup.net> # Make sure we don't output everything on the 1 line set horizontal-scroll-mode Off @@ -51,7 +52,7 @@ set bell-style none "\e[H": beginning-of-line "\e[F": end-of-line -# End /etc/inputrc +# End /etc/inputrc</literal> EOF</userinput></screen> </sect1> diff --git a/chapter07/network.xml b/chapter07/network.xml index cc5f25244..b01da80a1 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -17,28 +17,29 @@ <screen><userinput>cd /etc/sysconfig/network-devices && mkdir ifconfig.eth0 && cat > ifconfig.eth0/ipv4 << "EOF" -ONBOOT=yes +<literal>ONBOOT=yes SERVICE=ipv4-static IP=192.168.1.1 GATEWAY=192.168.1.2 PREFIX=24 -BROADCAST=192.168.1.255 +BROADCAST=192.168.1.255</literal> EOF</userinput></screen> </sect2> <sect2 id="resolv.conf"> -<title>Creating the /etc/resolv.conf file</title> +<title>Creating the /etc/resolv.conf File</title> <para>Create the file by running the following:</para> <screen><userinput>cat > /etc/resolv.conf << "EOF" -# Begin /etc/resolv.conf +<literal># Begin /etc/resolv.conf domain {<replaceable>[Your Domain Name]</replaceable>} -nameserver <replaceable>[IP address of your nameserver]</replaceable> +nameserver <replaceable>[IP address of your primary nameserver]</replaceable> +nameserver <replaceable>[IP address of your secondary nameserver]</replaceable> -# End /etc/resolv.conf +# End /etc/resolv.conf</literal> EOF</userinput></screen> </sect2> diff --git a/chapter07/profile.xml b/chapter07/profile.xml index f487dacf5..bbb8d244c 100644 --- a/chapter07/profile.xml +++ b/chapter07/profile.xml @@ -11,13 +11,13 @@ <para>Create the <filename>/etc/profile</filename> file:</para> <screen><userinput>cat > /etc/profile << "EOF" -# Begin /etc/profile +<literal># Begin /etc/profile export LC_ALL=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable> export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable> export INPUTRC=/etc/inputrc -# End /etc/profile +# End /etc/profile</literal> EOF</userinput></screen> </sect1> diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml index 577eae54c..37bd0ac46 100644 --- a/chapter07/setclock.xml +++ b/chapter07/setclock.xml @@ -12,11 +12,11 @@ the following:</para> <screen><userinput>cat > /etc/sysconfig/clock << "EOF" -# Begin /etc/sysconfig/clock +<literal># Begin /etc/sysconfig/clock UTC=1 -# End /etc/sysconfig/clock +# End /etc/sysconfig/clock</literal> EOF</userinput></screen> </sect1> diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml index 443f21e9c..7faeaabb2 100644 --- a/chapter08/fstab.xml +++ b/chapter08/fstab.xml @@ -7,19 +7,19 @@ <title>Creating the /etc/fstab File</title> <?dbhtml filename="fstab.html"?> - <screen><userinput>cat > /etc/fstab << "EOF" -# Begin /etc/fstab +<literal># Begin /etc/fstab -# file system mount-point fs-type options dump fsck-order +# file system mount-point type options dump fsck +# order -/dev/<replaceable>[xxx]</replaceable> / <replaceable>[fff]</replaceable> defaults 1 1 -/dev/<replaceable>[yyy]</replaceable> swap swap pri=1 0 0 -proc /proc proc defaults 0 0 -sysfs /sys sysfs defaults 0 0 -devpts /dev/pts devpts gid=4,mode=620 0 0 -shm /dev/shm tmpfs defaults 0 0 -# End /etc/fstab +/dev/<replaceable>[xxx]</replaceable> / <replaceable>[fff]</replaceable> defaults 1 1 +/dev/<replaceable>[yyy]</replaceable> swap swap pri=1 0 0 +proc /proc proc defaults 0 0 +sysfs /sys sysfs defaults 0 0 +devpts /dev/pts devpts gid=4,mode=620 0 0 +shm /dev/shm tmpfs defaults 0 0 +# End /etc/fstab</literal> EOF</userinput></screen> </sect1> diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 3ccad5339..970194b57 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -38,7 +38,7 @@ files -- you can use the Tab key everywhere to make Grub show the alternatives:< boot menu:</para> <screen><userinput>cat > /boot/grub/menu.lst << "EOF" -# Begin /boot/grub/menu.lst +<literal># Begin /boot/grub/menu.lst # By default boot the first menu entry. default 0 @@ -52,26 +52,26 @@ color green/black light-green/black # The first entry is for LFS. title LFS &version; root (hd0,3) -kernel /boot/lfskernel-&linux-version; root=/dev/hda4 +kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal> EOF</userinput></screen> <para>You may want to add an entry for your host distribution. It might look like this:</para> <screen><userinput>cat >> /boot/grub/menu.lst << "EOF" -title Red Hat +<literal>title Red Hat root (hd0,2) kernel /boot/kernel-2.4.20 root=/dev/hda3 -initrd /boot/initrd-2.4.20 +initrd /boot/initrd-2.4.20</literal> EOF</userinput></screen> <para>Also, if you happen to dual-boot Windows, the following entry should allow booting it:</para> <screen><userinput>cat >> /boot/grub/menu.lst << "EOF" -title Windows +<literal>title Windows rootnoverify (hd0,0) -chainloader +1 +chainloader +1</literal> EOF</userinput></screen> <para>The FHS stipulates that Grub's menu.lst file should be symlinked to diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 01bac036b..5a4c60c90 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -33,11 +33,13 @@ processes to gain root privledges upon loading of a kernel module. See: <screen><userinput>make mrproper</userinput></screen> +<!--NEW: the sed command has been removed--> + <para>If, in <xref linkend="ch-scripts-console"/>, you decided you want to compile the keymap into the kernel, issue the command below:</para> <screen><userinput>loadkeys -m /usr/share/kbd/keymaps/<replaceable>[path to keymap]</replaceable> > \ - <replaceable>[unpacked sources dir]</replaceable>/linux-&linux-version;/drivers/char/defkeymap.c</userinput></screen> + drivers/char/defkeymap.c</userinput></screen> <para>Configure the kernel via a menu-driven interface:</para> |