diff options
113 files changed, 0 insertions, 288 deletions
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml index fa66e9aa6..0bcfb341c 100644 --- a/Attic/appendixc/packages.xml +++ b/Attic/appendixc/packages.xml @@ -8,7 +8,6 @@ package quicker. </para> <literallayout> - &ac-bash; &ac-binutils; &ac-bzip2; @@ -67,7 +66,6 @@ package quicker. &ac-manpages; &ac-netkitbase; &ac-nettools; - </literallayout> </sect1> diff --git a/appendixa/bison-desc.xml b/appendixa/bison-desc.xml index 5350da410..15d68fc7b 100644 --- a/appendixa/bison-desc.xml +++ b/appendixa/bison-desc.xml @@ -43,7 +43,6 @@ to the compiler: </para> <blockquote><literallayout> - + / \ * 1 diff --git a/chapter01/subscribe.xml b/chapter01/subscribe.xml index 55b22ea4b..4ba8f1fc9 100644 --- a/chapter01/subscribe.xml +++ b/chapter01/subscribe.xml @@ -15,14 +15,12 @@ commands in the body of the email. The email will look like: </para> <blockquote><literallayout> - To: listar@linuxfromscratch.org Subject: subscribe lfs-discuss subscribe lfs-apps subscribe alfs-discuss - </literallayout></blockquote> <para> diff --git a/chapter01/unsubscribe.xml b/chapter01/unsubscribe.xml index bd1604652..425071d95 100644 --- a/chapter01/unsubscribe.xml +++ b/chapter01/unsubscribe.xml @@ -16,14 +16,12 @@ like: </para> <blockquote><literallayout> - To: listar@linuxfromscratch.org Subject: unsubscribe lfs-discuss unsubscribe lfs-apps unsubscribe alfs-discuss - </literallayout></blockquote> <para> diff --git a/chapter02/install.xml b/chapter02/install.xml index 15dbb6f5f..e5b2e4c3c 100644 --- a/chapter02/install.xml +++ b/chapter02/install.xml @@ -14,9 +14,7 @@ To start with, change to the $LFS/usr/src directory by running: </para> <blockquote><literallayout> - <userinput>cd $LFS/usr/src</userinput> - </literallayout></blockquote> <para> @@ -26,10 +24,8 @@ filename: </para> <blockquote><literallayout> - <userinput>tar xvzf filename.tar.gz</userinput> <userinput>tar xvzf filename.tgz</userinput> - </literallayout></blockquote> @@ -39,9 +35,7 @@ running: </para> <blockquote><literallayout> - <userinput>bzcat filename.tar.bz2 | tar xv</userinput> - </literallayout></blockquote> <para> @@ -57,9 +51,7 @@ If a file is just tar'ed, it is unpacked by running: </para> <blockquote><literallayout> - <userinput>tar xvf filename.tar</userinput> - </literallayout></blockquote> <para> @@ -82,9 +74,7 @@ If a file is gzip'ed, it is unpacked by running: </para> <blockquote><literallayout> - <userinput>gunzip filename.gz</userinput> - </literallayout></blockquote> <para> @@ -92,9 +82,7 @@ If a file is bzip2'ed, it is unpacked by running: </para> <blockquote><literallayout> - <userinput>bunzip2 filename.bz2</userinput> - </literallayout></blockquote> <para> diff --git a/chapter03/creatingdirs.xml b/chapter03/creatingdirs.xml index b610da4e8..0e42e620e 100644 --- a/chapter03/creatingdirs.xml +++ b/chapter03/creatingdirs.xml @@ -9,7 +9,6 @@ Issuing the following commands will create a default directory layout: </para> <blockquote><literallayout> - <userinput>cd $LFS</userinput> <userinput>mkdir -p bin boot dev/pts etc home lib mnt proc root sbin tmp var</userinput> @@ -31,7 +30,6 @@ Issuing the following commands will create a default directory layout: <userinput>done</userinput> <userinput>cd $LFS/var</userinput> <userinput>mkdir lock log mail run spool tmp</userinput> - </literallayout></blockquote> <para> @@ -46,11 +44,9 @@ the so-called "sticky bit" - bit 1 of the 1777 bit mask). </para> <blockquote><literallayout> - <userinput>cd $LFS &&</userinput> <userinput>chmod 0750 root &&</userinput> <userinput>chmod 1777 tmp usr/tmp usr/local/tmp var/tmp</userinput> - </literallayout></blockquote> <para> diff --git a/chapter03/creatingfs.xml b/chapter03/creatingfs.xml index a811ca4ce..14028202d 100644 --- a/chapter03/creatingfs.xml +++ b/chapter03/creatingfs.xml @@ -16,9 +16,7 @@ is used as the only option to the command and the file system is created. </para> <blockquote><literallayout> - <userinput>mke2fs /dev/xxx</userinput> - </literallayout></blockquote> <para> diff --git a/chapter03/mounting.xml b/chapter03/mounting.xml index 3238508df..562706186 100644 --- a/chapter03/mounting.xml +++ b/chapter03/mounting.xml @@ -15,9 +15,7 @@ Create the /mnt/lfs directory by running: </para> <blockquote><literallayout> - <userinput>mkdir -p /mnt/lfs</userinput> - </literallayout></blockquote> <para> @@ -25,9 +23,7 @@ Now mount the LFS partition by running: </para> <blockquote><literallayout> - <userinput>mount /dev/xxx /mnt/lfs</userinput> - </literallayout></blockquote> <para> diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 1ea8a1260..d20e8d8ad 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -2,7 +2,6 @@ <title>Packages that need to be downloaded</title> <literallayout> - &c3-toplevel; &c3-all; &c3-bash; @@ -65,7 +64,6 @@ &c3-nettools; Total size of all intel-packages: 70,240 KB (68,60 MB) - </literallayout> </sect1> diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index 3ff584bcb..a436f5831 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -6,7 +6,6 @@ Install Bash by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --enable-static-link --prefix=$LFS/usr \</userinput> <userinput> --bindir=$LFS/bin --with-curses &&</userinput> @@ -14,7 +13,6 @@ Install Bash by running the following commands: <userinput>make install &&</userinput> <userinput>cd $LFS/bin &&</userinput> <userinput>ln -s bash sh</userinput> - </literallayout></blockquote> <para> @@ -30,10 +28,8 @@ first and adjust the path in the following commands accordingly: </para> <blockquote><literallayout> - <userinput>cd /usr/lib &&</userinput> <userinput>ln -s libncurses.a libcurses.a</userinput> - </literallayout></blockquote> <para> diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml index f08640f42..bcda9a2a7 100644 --- a/chapter05/binutils-inst.xml +++ b/chapter05/binutils-inst.xml @@ -6,13 +6,11 @@ Install Binutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make -e LDFLAGS=-all-static tooldir=$LFS/usr &&</userinput> <userinput>make -e tooldir=$LFS/usr install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 277ee2f5e..847b2637b 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -6,7 +6,6 @@ Install Bzip2 by running the following commands: </para> <blockquote><literallayout> - <userinput>sed \</userinput> <userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) \$(LDFLAGS) -o"/ \</userinput> @@ -15,7 +14,6 @@ Install Bzip2 by running the following commands: <userinput>make PREFIX=$LFS/usr install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> <userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index e3e6a6a95..bff2e4813 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -6,14 +6,12 @@ Install Diffutils by running the following commands: </para> <blockquote><literallayout> - <userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> <userinput>./configure --prefix=$LFS/usr &&</userinput> <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index fd3958874..8f2f53948 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -6,7 +6,6 @@ Install Fileutils by running the following commands: </para> <blockquote><literallayout> - <userinput>patch -Np1 -i ../fileutils-4.0.patch &&</userinput> <userinput>./configure --disable-nls \</userinput> @@ -16,7 +15,6 @@ Install Fileutils by running the following commands: <userinput>make install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> <userinput>ln -s ../../bin/install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 732aeba0b..c7832bd96 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -6,7 +6,6 @@ Install GCC by running the following commands: </para> <blockquote><literallayout> - <userinput>mkdir $LFS/usr/src/gcc-build &&</userinput> <userinput>cd $LFS/usr/src/gcc-build &&</userinput> <userinput>../gcc-2.95.2.1/configure --prefix=/usr \</userinput> @@ -27,7 +26,6 @@ Install GCC by running the following commands: &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> <userinput>ln -s gcc cc</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/gettext-inst.xml b/chapter05/gettext-inst.xml index b78d4c711..210ef82ae 100644 --- a/chapter05/gettext-inst.xml +++ b/chapter05/gettext-inst.xml @@ -6,13 +6,11 @@ Install Gettext by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --disable-nls &&</userinput> <userinput>make -C lib &&</userinput> <userinput>make -C intl &&</userinput> <userinput>make -C src LDFLAGS=-all-static msgfmt &&</userinput> <userinput>cp src/msgfmt $LFS/usr/bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index ecf2051ee..7b5c12b79 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -6,7 +6,6 @@ Install Grep by running the following commands: </para> <blockquote><literallayout> - <userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> <userinput>./configure --prefix=$LFS/usr --disable-nls @@ -14,7 +13,6 @@ Install Grep by running the following commands: <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 436410529..5f09cbe84 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -6,7 +6,6 @@ Before Gzip is installed, the gzip patch file needs to be unpacked. </para> <blockquote><literallayout> - <userinput>patch -Np1 -i ../gzip-1.2.4a.patch &&</userinput> <userinput>./configure --prefix=$LFS/usr &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> @@ -14,7 +13,6 @@ Before Gzip is installed, the gzip patch file needs to be unpacked. <userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &&</userinput> <userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index de413dc92..05278c75c 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -41,9 +41,7 @@ properly if you decided to make use of it. Run the following: </para> <blockquote><literallayout> - <userinput>echo $LFS</userinput> - </literallayout></blockquote> <para> diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml index a4fc39af0..44974545e 100644 --- a/chapter05/kernel-inst.xml +++ b/chapter05/kernel-inst.xml @@ -14,14 +14,12 @@ The kernel configuration file is created by running the following command: </para> <blockquote><literallayout> - <userinput>make mrproper &&</userinput> <userinput>yes "" | make config &&</userinput> <userinput>make dep &&</userinput> <userinput>cd $LFS/usr/include &&</userinput> <userinput>ln -s ../src/linux/include/linux &&</userinput> <userinput>ln -s ../src/linux/include/asm</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 74fee7dea..4e8929b94 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -6,12 +6,10 @@ Install Make by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml index afc15840c..a1f731bd1 100644 --- a/chapter05/mawk-inst.xml +++ b/chapter05/mawk-inst.xml @@ -6,7 +6,6 @@ Install Mawk by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure &&</userinput> <userinput>sed \</userinput> <userinput> s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) @@ -16,7 +15,6 @@ Install Mawk by running the following commands: <userinput>make BINDIR=$LFS/usr/bin \</userinput> <userinput> MANDIR=$LFS/usr/share/man/man1 install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml index b56a97906..87357d6e0 100644 --- a/chapter05/oldnsslib.xml +++ b/chapter05/oldnsslib.xml @@ -10,9 +10,7 @@ uses by simply executing the library, like this: </para> <blockquote><literallayout> - <userinput>/lib/libc.so.6</userinput> - </literallayout></blockquote> <para> @@ -22,9 +20,7 @@ distribution, copy the NSS library files by running: </para> <blockquote><literallayout> - <userinput>cp -av /lib/libnss* $LFS/lib</userinput> - </literallayout></blockquote> </sect1> diff --git a/chapter05/proc.xml b/chapter05/proc.xml index 6c4ab7d8b..27cea3ee5 100644 --- a/chapter05/proc.xml +++ b/chapter05/proc.xml @@ -14,9 +14,7 @@ The proc file system is mounted under $LFS/proc by running the following command </para> <blockquote><literallayout> - <userinput>mount proc $LFS/proc -t proc</userinput> - </literallayout></blockquote> </sect1> diff --git a/chapter05/pwdgroup.xml b/chapter05/pwdgroup.xml index 0e27d6c82..279e73e18 100644 --- a/chapter05/pwdgroup.xml +++ b/chapter05/pwdgroup.xml @@ -22,10 +22,8 @@ following command: </para> <blockquote><literallayout> - <userinput>echo "root:x:0:0:root:/root:/bin/bash" > $LFS/etc/passwd</userinput> - </literallayout></blockquote> <para> @@ -34,7 +32,6 @@ following: </para> <literallayout> - <userinput>cat > $LFS/etc/group << "EOF"</userinput> root:x:0: bin:x:1: @@ -49,7 +46,6 @@ following: dialout:x:10: audio:x:11: <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 09894fbfb..7be838ca6 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -6,7 +6,6 @@ Install Sed by running the following commands: </para> <blockquote><literallayout> - <userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&</userinput> <userinput>./configure --prefix=$LFS/usr @@ -14,7 +13,6 @@ Install Sed by running the following commands: <userinput>unset CPPFLAGS &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 5c65eefc7..3da0e0b18 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -6,7 +6,6 @@ Install Shellutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> @@ -14,7 +13,6 @@ Install Shellutils by running the following commands: <userinput>cd $LFS/usr/bin &&</userinput> <userinput>mv date echo false pwd stty $LFS/bin &&</userinput> <userinput>mv su true uname hostname $LFS/bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index 6eeba1ef3..50851a19d 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -13,11 +13,9 @@ Apply the patch by running the following command: </para> <blockquote><literallayout> - <userinput>cd src &&</userinput> <userinput>patch -i ../../gnutarpatch.txt &&</userinput> <userinput>cd ..</userinput> - </literallayout></blockquote> <para> @@ -25,7 +23,6 @@ Install Tar by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls \</userinput> <userinput> --libexecdir=$LFS/usr/bin && @@ -33,7 +30,6 @@ Install Tar by running the following commands: <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> <userinput>mv $LFS/usr/bin/tar $LFS/bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 34633361a..317630604 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -6,12 +6,10 @@ Install Texinfo by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index 2fe91620c..c21d6cd53 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -6,13 +6,11 @@ Install Textutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> <userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml index 6d66859a3..ac52be9ff 100644 --- a/chapter06/autoconf-inst.xml +++ b/chapter06/autoconf-inst.xml @@ -6,11 +6,9 @@ Install Autoconf by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml index a15fd7f82..9d3238e77 100644 --- a/chapter06/automake-inst.xml +++ b/chapter06/automake-inst.xml @@ -6,10 +6,8 @@ Install Automake by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index feb1f3796..bc5c142c6 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -6,13 +6,11 @@ Install Bash by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --with-curses &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>logout</userinput> - </literallayout></blockquote> <para> @@ -21,7 +19,6 @@ environment is re-entered by running: </para> <blockquote><literallayout> - <userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin &&</userinput> <userinput>chroot $LFS /usr/bin/env -i HOME=/root diff --git a/chapter06/bashprofile.xml b/chapter06/bashprofile.xml index 00c56f3b7..bb7f6115a 100644 --- a/chapter06/bashprofile.xml +++ b/chapter06/bashprofile.xml @@ -15,7 +15,6 @@ by running the following. </para> <literallayout> - <userinput>cat > $LFS/root/.bash_profile << "EOF"</userinput> # Begin /root/.bash_profile @@ -26,7 +25,6 @@ export PS1 PATH # End /root/.bash_profile <userinput>EOF</userinput> - </literallayout> <para> diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml index bd75c6d25..e4d83eaef 100644 --- a/chapter06/bin86-inst.xml +++ b/chapter06/bin86-inst.xml @@ -6,10 +6,8 @@ Install Bin86 by running the following commands: </para> <blockquote><literallayout> - <userinput>make &&</userinput> <userinput>make PREFIX=/usr install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index 49e751e2e..8710e62d6 100644 --- a/chapter06/binutils-inst.xml +++ b/chapter06/binutils-inst.xml @@ -5,12 +5,10 @@ Install Binutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --enable-shared &&</userinput> <userinput>make -e tooldir=/usr &&</userinput> <userinput>make -e tooldir=/usr install &&</userinput> <userinput>make -e tooldir=/usr install-info</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml index 6d44ec182..f5ae99dbe 100644 --- a/chapter06/bison-inst.xml +++ b/chapter06/bison-inst.xml @@ -6,13 +6,11 @@ Install Bison by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr \</userinput> <userinput> --datadir=/usr/share/bison &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> <para> @@ -28,7 +26,6 @@ following: </para> <literallayout> - <userinput>cat > /usr/bin/yacc << "EOF"</userinput> #!/bin/sh # Begin /usr/bin/yacc @@ -38,7 +35,6 @@ following: # End /usr/bin/yacc <userinput>EOF</userinput> <userinput>chmod 755 /usr/bin/yacc</userinput> - </literallayout> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 16ce4a2bc..b34f5ee50 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -6,7 +6,6 @@ Install Bzip2 by running the following commands: </para> <blockquote><literallayout> - <userinput>make -f Makefile-libbz2_so &&</userinput> <userinput>make bzip2recover libbz2.a &&</userinput> <userinput>cp bzip2-shared /bin/bzip2 &&</userinput> @@ -23,7 +22,6 @@ Install Bzip2 by running the following commands: <userinput>ln -s bzip2.1 bunzip2.1 &&</userinput> <userinput>ln -s bzip2.1 bzcat.1 &&</userinput> <userinput>ln -s bzip2.1 bzip2recover.1</userinput> - </literallayout></blockquote> <para> diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index 040f34df7..906d71b48 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -14,12 +14,10 @@ actually /mnt/lfs but the shell doesn't know that). </para> <blockquote><literallayout> - <userinput>cd $LFS &&</userinput> <userinput>chroot $LFS /usr/bin/env -i HOME=/root \</userinput> <userinput> TERM=$TERM /bin/bash --login</userinput> - </literallayout></blockquote> <para> diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml index 5c6b514ae..7acdfcce9 100644 --- a/chapter06/config-glibc.xml +++ b/chapter06/config-glibc.xml @@ -13,7 +13,6 @@ following: </para> <literallayout> - <userinput>cat > /etc/nsswitch.conf << "EOF"</userinput> # Begin /etc/nsswitch.conf @@ -35,7 +34,6 @@ netgroup: db files # End /etc/nsswitch.conf <userinput>EOF</userinput> - </literallayout> <para> @@ -51,11 +49,9 @@ by running: </para> <blockquote><literallayout> - <userinput>cd /etc &&</userinput> <userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput> - </literallayout></blockquote> <para> @@ -68,9 +64,7 @@ The symlink a user would create with that information would be: </para> <blockquote><literallayout> - <userinput>ln -s ../usr/share/zoneinfo/EST5EDT localtime</userinput> - </literallayout></blockquote> <para> @@ -78,10 +72,8 @@ Or: </para> <blockquote><literallayout> - <userinput>ln -s ../usr/share/zoneinfo/Canada/Eastern localtime </userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/config-ldso.xml b/chapter06/config-ldso.xml index 75256b5fd..d8057fbf8 100644 --- a/chapter06/config-ldso.xml +++ b/chapter06/config-ldso.xml @@ -18,7 +18,6 @@ following: </para> <literallayout> - <userinput>cat > /etc/ld.so.conf << "EOF"</userinput> # Begin /etc/ld.so.conf @@ -28,7 +27,6 @@ following: # End /etc/ld.so.conf <userinput>EOF</userinput> - </literallayout> <para> diff --git a/chapter06/config-sysklogd.xml b/chapter06/config-sysklogd.xml index 12a12563b..900010b28 100644 --- a/chapter06/config-sysklogd.xml +++ b/chapter06/config-sysklogd.xml @@ -6,7 +6,6 @@ following: </para> <literallayout> - <userinput>cat > /etc/syslog.conf << "EOF"</userinput> # Begin /etc/syslog.conf @@ -20,7 +19,6 @@ user.* -/var/log/user.log # End /etc/syslog.conf <userinput>EOF</userinput> - </literallayout> </sect2> diff --git a/chapter06/config-sysvinit.xml b/chapter06/config-sysvinit.xml index 71b43faad..fafb372f7 100644 --- a/chapter06/config-sysvinit.xml +++ b/chapter06/config-sysvinit.xml @@ -6,7 +6,6 @@ following: </para> <literallayout> - <userinput>cat > /etc/inittab << "EOF"</userinput> # Begin /etc/inittab @@ -35,7 +34,6 @@ su:S016:respawn:/sbin/sulogin # End /etc/inittab <userinput>EOF</userinput> - </literallayout> </sect2> diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml index 4e8146aa1..8ebe220b8 100644 --- a/chapter06/config-vim.xml +++ b/chapter06/config-vim.xml @@ -8,7 +8,6 @@ have included Vim in this book but the original Vi). Create the </para> <literallayout> - <userinput>cat > /root/.vimrc << "EOF"</userinput> " Begin /root/.vimrc @@ -17,7 +16,6 @@ set bs=2 " End /root/.vimrc <userinput>EOF</userinput> - </literallayout> </sect2> diff --git a/chapter06/create-password.xml b/chapter06/create-password.xml index 4c2aee8ab..71492ffdf 100644 --- a/chapter06/create-password.xml +++ b/chapter06/create-password.xml @@ -7,9 +7,7 @@ command: </para> <blockquote><literallayout> - <userinput>passwd root</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/create-utmp.xml b/chapter06/create-utmp.xml index 977c1b93c..cbc5703ff 100644 --- a/chapter06/create-utmp.xml +++ b/chapter06/create-utmp.xml @@ -16,12 +16,10 @@ following commands: </para> <blockquote><literallayout> - <userinput>touch /var/run/utmp /var/log/wtmp /var/log/btmp /var/log/lastlog &&</userinput> <userinput>chmod 644 /var/run/utmp /var/log/wtmp /var/log/btmp /var/log/lastlog</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml index 9b2dd5587..7a6bd1607 100644 --- a/chapter06/diffutils-inst.xml +++ b/chapter06/diffutils-inst.xml @@ -6,11 +6,9 @@ Install Diffutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index d06fd605e..88d2aadb2 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -11,13 +11,11 @@ to be like this. We did not forget to supply a value there. </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --with-root-prefix= \</userinput> <userinput> --enable-elf-shlibs &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make install-libs</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 9e846d210..1cafca834 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -6,12 +6,10 @@ Install Ed by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index 333f43868..d3d9566cc 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -6,12 +6,10 @@ Install File by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> <para> @@ -29,9 +27,7 @@ it was meant to be: </para> <blockquote><literallayout> - <userinput>file -C</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index 55023e615..8c790d242 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -6,7 +6,6 @@ Install Fileutils by running the following commands: </para> <blockquote><literallayout> - <userinput>patch -Np1 -i ../fileutils-4.0.patch &&</userinput> <userinput>./configure --prefix=/usr --bindir=/bin \</userinput> @@ -14,7 +13,6 @@ Install Fileutils by running the following commands: &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index 7a0ca519a..cfb308bfb 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -10,12 +10,10 @@ Install Findutils by running the following commands: </para> <blockquote><literallayout> - <userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make libexecdir=/usr/bin install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index f93f42bcb..a14173da8 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -6,13 +6,11 @@ Install Flex by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>ln -s flex lex</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index b65465afa..474455134 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -6,7 +6,6 @@ Install GCC by running the following commands: </para> <blockquote><literallayout> - <userinput>mkdir /usr/src/gcc-build &&</userinput> <userinput>cd /usr/src/gcc-build &&</userinput> <userinput>../gcc-2.95.2.1/configure --prefix=/usr \</userinput> @@ -16,7 +15,6 @@ Install GCC by running the following commands: --enable-languages=c,c++ &&</userinput> <userinput>make bootstrap &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml index a88793b82..228d2dc93 100644 --- a/chapter06/gettext-inst.xml +++ b/chapter06/gettext-inst.xml @@ -6,11 +6,9 @@ Install Gettext by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index e253af973..10160b200 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -11,7 +11,6 @@ Install Glibc by running the following commands: </para> <blockquote><literallayout> - <userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> <userinput>touch /etc/ld.so.conf &&</userinput> <userinput>mkdir /usr/src/glibc-build &&</userinput> @@ -38,7 +37,6 @@ Install Glibc by running the following commands: <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make localedata/install-locales</userinput> - </literallayout></blockquote> <para> @@ -54,7 +52,6 @@ Run the following commands to accomplish this: </para> <blockquote><literallayout> - <userinput>logout</userinput> <userinput>chroot $LFS /usr/bin/env -i HOME=/root \</userinput> diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml index d461dc799..8b48c2c42 100644 --- a/chapter06/grep-inst.xml +++ b/chapter06/grep-inst.xml @@ -6,11 +6,9 @@ Install Grep by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index 62cff4745..1bc083172 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -6,11 +6,9 @@ Install Groff by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 32147581c..80de916ae 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -6,7 +6,6 @@ Install Gzip by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> @@ -17,7 +16,6 @@ Install Gzip by running the following commands: <userinput>ln -sf gzip gunzip &&</userinput> <userinput>ln -s gzip compress &&</userinput> <userinput>ln -s gunzip uncompress</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index 638ceab5b..adc5e3443 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -6,13 +6,11 @@ Install Kbd by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --datadir=/usr/share/kbd &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput> - </literallayout></blockquote> <para> @@ -22,10 +20,8 @@ as a default. Then execute this command: </para> <blockquote><literallayout> - <userinput>cd /usr/share/kbd/keymaps &&</userinput> <userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> - </literallayout></blockquote> <para> diff --git a/chapter06/ldso-inst.xml b/chapter06/ldso-inst.xml index d89670ab4..011a87251 100644 --- a/chapter06/ldso-inst.xml +++ b/chapter06/ldso-inst.xml @@ -6,11 +6,9 @@ Install Ld.so by running the following commands: </para> <blockquote><literallayout> - <userinput>cd man &&</userinput> <userinput>cp ldd.1 /usr/share/man/man1 &&</userinput> <userinput>cp *.8 /usr/share/man/man8</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml index 6deacf428..f4804c6aa 100644 --- a/chapter06/less-inst.xml +++ b/chapter06/less-inst.xml @@ -6,11 +6,9 @@ Install Less by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml index 1a651a38b..6e41a07d3 100644 --- a/chapter06/libtool-inst.xml +++ b/chapter06/libtool-inst.xml @@ -6,11 +6,9 @@ Install Libtool by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml index b9ea040f7..1d69545b0 100644 --- a/chapter06/lilo-inst.xml +++ b/chapter06/lilo-inst.xml @@ -6,10 +6,8 @@ Install Lilo by running the following commands: </para> <blockquote><literallayout> - <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> <para> diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml index 31e583d33..5d175839d 100644 --- a/chapter06/m4-inst.xml +++ b/chapter06/m4-inst.xml @@ -6,11 +6,9 @@ Install M4 by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> <para> @@ -32,13 +30,11 @@ commands: </para> <blockquote><literallayout> - <userinput>logout</userinput> <userinput>cd $LFS/usr/src/m4-1.4</userinput> <userinput>./configure --prefix=/usr</userinput> <userinput>make LDFLAGS=-static</userinput> <userinput>make prefix=$LFS/usr install</userinput> - </literallayout></blockquote> <para> @@ -49,9 +45,7 @@ after having rebooted into the LFS system rather than chrooting into it. </para> <blockquote><literallayout> - <userinput>chroot $LFS env -i HOME=/root bash --login</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml index 1f7e4e3d0..e4e50076a 100644 --- a/chapter06/make-inst.xml +++ b/chapter06/make-inst.xml @@ -6,11 +6,9 @@ Install Make by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index 91ee436ee..c3f6bee1b 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -11,12 +11,10 @@ Create the device files by running the following commands: </para> <blockquote><literallayout> - <userinput>chmod 755 MAKEDEV &&</userinput> <userinput>cp MAKEDEV /dev &&</userinput> <userinput>cd /dev &&</userinput> <userinput>./MAKEDEV -v generic</userinput> - </literallayout></blockquote> <para> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index b3e9eec8f..a92e4cd46 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -6,7 +6,6 @@ Install Man by running the following commands: </para> <blockquote><literallayout> - <userinput>sed -e 's|in \(.*\$PATH\)|in `echo \1`|' \</userinput> <userinput> configure > tmp~ @@ -23,7 +22,6 @@ Install Man by running the following commands: <userinput>mv makewhatis-new /usr/sbin/makewhatis && </userinput> <userinput>chmod 755 /usr/sbin/makewhatis</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml index 9a03eb9d1..1ad88f7e0 100644 --- a/chapter06/manpages-inst.xml +++ b/chapter06/manpages-inst.xml @@ -6,9 +6,7 @@ Install Man-pages by running the following commands: </para> <blockquote><literallayout> - <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml index 735294010..a04a4c4d0 100644 --- a/chapter06/mawk-inst.xml +++ b/chapter06/mawk-inst.xml @@ -6,7 +6,6 @@ Install Mawk by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make BINDIR=/usr/bin \</userinput> @@ -14,7 +13,6 @@ Install Mawk by running the following commands: &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>ln -s mawk awk</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml index d682fd2ab..dbe4a3291 100644 --- a/chapter06/modutils-inst.xml +++ b/chapter06/modutils-inst.xml @@ -6,11 +6,9 @@ Install Modutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 4dd204e30..a314c20a4 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -6,7 +6,6 @@ Install Ncurses by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --libdir=/lib \</userinput> <userinput> --with-shared --disable-termcap &&</userinput> @@ -14,7 +13,6 @@ Install Ncurses by running the following commands: <userinput>make install &&</userinput> <userinput>cd /lib &&</userinput> <userinput>ln -s libncurses.a libcurses.a</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index 86d995ef8..e631d2e56 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -12,7 +12,6 @@ Install Netkit-base by running the following commands: <userinput>make install &&</userinput> <userinput>cd etc.sample &&</userinput> <userinput>cp services protocols /etc</userinput> - </literallayout></blockquote> <para> diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index b651472de..663b75c4e 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -11,10 +11,8 @@ Install Net-tools by running the following commands: </para> <blockquote><literallayout> - <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml index a63f77030..e4a570eb2 100644 --- a/chapter06/patch-inst.xml +++ b/chapter06/patch-inst.xml @@ -6,11 +6,9 @@ Install Patch by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml index 93c71707d..05c565f7f 100644 --- a/chapter06/perl-inst.xml +++ b/chapter06/perl-inst.xml @@ -6,11 +6,9 @@ Install Perl by running the following commands: </para> <blockquote><literallayout> - <userinput>./Configure -Dprefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> <para> @@ -22,11 +20,9 @@ to perl as well. The commands with these parameters included will be: </para> <blockquote><literallayout> - <userinput>./Configure -Dprefix=/usr -d -e &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml index e491563e8..e7ace1191 100644 --- a/chapter06/procinfo-inst.xml +++ b/chapter06/procinfo-inst.xml @@ -6,11 +6,9 @@ Install Procinfo by running the following commands: </para> <blockquote><literallayout> - <userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index f89712ad0..3c93dc08f 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -6,12 +6,10 @@ Install Procps by running the following commands: </para> <blockquote><literallayout> - <userinput>make &&</userinput> <userinput>make XSCPT='' install &&</userinput> <userinput>mv /usr/bin/kill /bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml index e00629db7..556b82f56 100644 --- a/chapter06/psmisc-inst.xml +++ b/chapter06/psmisc-inst.xml @@ -6,11 +6,9 @@ Install Psmisc by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml index 71c689997..0e2d138af 100644 --- a/chapter06/removeoldnss.xml +++ b/chapter06/removeoldnss.xml @@ -8,9 +8,7 @@ them now by running: </para> <blockquote><literallayout> - <userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput> - </literallayout></blockquote> </sect1> diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml index ef0146123..010b7f17d 100644 --- a/chapter06/sed-inst.xml +++ b/chapter06/sed-inst.xml @@ -6,11 +6,9 @@ Install Sed by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 3cff4accd..6d21c7197 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -6,7 +6,6 @@ Install the Shadow Password Suite by running the following commands: </para> <blockquote><literallayout> - <userinput>patch -Np1 -i ../shadow-20001016.patch &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> @@ -15,7 +14,6 @@ Install the Shadow Password Suite by running the following commands: <userinput>cp limits login.access login.defs.linux /etc &&</userinput> <userinput>mv /etc/login.defs.linux /etc/login.defs</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index c3aa812f6..2f7c802eb 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -6,14 +6,12 @@ Install Shellutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>mv date echo false pwd stty /bin &&</userinput> <userinput>mv su true uname hostname /bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/sysklogd-inst.xml b/chapter06/sysklogd-inst.xml index b0c15fcd4..4e669586a 100644 --- a/chapter06/sysklogd-inst.xml +++ b/chapter06/sysklogd-inst.xml @@ -6,10 +6,8 @@ Install Sysklogd by running the following commands: </para> <blockquote><literallayout> - <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 441fdc1b8..544ea3669 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -26,10 +26,8 @@ Install Sysvinit by running the following commands: </para> <blockquote><literallayout> - <userinput>make -C src &&</userinput> <userinput>make -C src install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml index 4072394db..b4dc00e13 100644 --- a/chapter06/tar-inst.xml +++ b/chapter06/tar-inst.xml @@ -14,11 +14,9 @@ Apply the patch by running the following command: </para> <blockquote><literallayout> - <userinput>cd src &&</userinput> <userinput>patch -i ../../gnutarpatch.txt &&</userinput> <userinput>cd ..</userinput> - </literallayout></blockquote> <para> @@ -27,13 +25,11 @@ directory: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr --libexecdir=/usr/bin &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>mv /usr/bin/tar /bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml index 540f438a5..2e44629ff 100644 --- a/chapter06/texinfo-inst.xml +++ b/chapter06/texinfo-inst.xml @@ -6,11 +6,9 @@ Install Texinfo by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index 0dc129bc9..76e401f10 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -6,12 +6,10 @@ Install Textutils by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>mv /usr/bin/cat /bin</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index 9f875eee2..b6652e8b4 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -6,7 +6,6 @@ Install Util-Linux by running the following commands: </para> <blockquote><literallayout> - <userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput> <userinput> MCONFIG > MCONFIG~ &&</userinput> @@ -14,7 +13,6 @@ Install Util-Linux by running the following commands: <userinput>./configure &&</userinput> <userinput>make &&</userinput> <userinput>make install</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 53f0f303a..2610dcd26 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -18,13 +18,11 @@ in which order it is done. Install Vim by running the following commands: </para> <blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>ln -s vim vi</userinput> - </literallayout></blockquote> <para> diff --git a/chapter07/checkfs.xml b/chapter07/checkfs.xml index 762bfacae..d19959303 100644 --- a/chapter07/checkfs.xml +++ b/chapter07/checkfs.xml @@ -7,7 +7,6 @@ the following: </para> <literallayout> - <userinput>cat > checkfs << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/checkfs @@ -109,7 +108,6 @@ fi # End /etc/init.d/checkfs <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/createdirs.xml b/chapter07/createdirs.xml index 6b54ae3fe..4c12a423f 100644 --- a/chapter07/createdirs.xml +++ b/chapter07/createdirs.xml @@ -7,12 +7,10 @@ the boot scripts. These directories are created by running: </para> <blockquote><literallayout> - <userinput>cd /etc &&</userinput> <userinput>mkdir sysconfig rc0.d rc1.d rc2.d rc3.d &&</userinput> <userinput>mkdir rc4.d rc5.d rc6.d init.d rcS.d &&</userinput> <userinput>cd init.d</userinput> - </literallayout></blockquote> </sect1> diff --git a/chapter07/ethnet-symperm.xml b/chapter07/ethnet-symperm.xml index c9df60e9b..d2bda8582 100644 --- a/chapter07/ethnet-symperm.xml +++ b/chapter07/ethnet-symperm.xml @@ -7,7 +7,6 @@ running the following commands: </para> <blockquote><literallayout> - <userinput>cd /etc/init.d &&</userinput> <userinput>chmod 754 ethnet &&</userinput> <userinput>cd ../rc3.d &&</userinput> @@ -16,7 +15,6 @@ running the following commands: <userinput>ln -s ../init.d/ethnet S200ethnet &&</userinput> <userinput>cd ../rc5.d &&</userinput> <userinput>ln -s ../init.d/ethnet S200ethnet</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter07/ethnet.xml b/chapter07/ethnet.xml index 46644fd4a..ac1cca09d 100644 --- a/chapter07/ethnet.xml +++ b/chapter07/ethnet.xml @@ -12,7 +12,6 @@ following: </para> <literallayout> - <userinput>cat > /etc/init.d/ethnet << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/ethnet @@ -111,7 +110,6 @@ esac # End /etc/init.d/ethnet <userinput>EOF</userinput> - </literallayout> <sect2> @@ -122,11 +120,9 @@ If a default gateway is required to be setup, the following command does that: </para> <literallayout> - <userinput>cat >> /etc/sysconfig/network << "EOF"</userinput> GATEWAY=192.168.1.2 <userinput>EOF</userinput> - </literallayout> <para> @@ -150,9 +146,7 @@ First the network-scripts directory is created by running: </para> <blockquote><literallayout> - <userinput>mkdir /etc/sysconfig/network-scripts</userinput> - </literallayout></blockquote> <para> @@ -162,7 +156,6 @@ This creates a sample file ifcfg-eth0: </para> <literallayout> - <userinput>cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF</userinput> ONBOOT=yes @@ -171,7 +164,6 @@ IP=192.168.1.1 NETMASK=255.255.255.0 BROADCAST=192.168.1.255 <userinput>EOF</userinput> - </literallayout> <para> diff --git a/chapter07/fstab.xml b/chapter07/fstab.xml index 63f9e305a..d896e5f77 100644 --- a/chapter07/fstab.xml +++ b/chapter07/fstab.xml @@ -9,7 +9,6 @@ following: </para> <literallayout> - <userinput>cat > /etc/fstab << "EOF"</userinput> # Begin /etc/fstab @@ -19,7 +18,6 @@ proc /proc proc defaults 0 0 # End /etc/fstab <userinput>EOF</userinput> - </literallayout> <para> diff --git a/chapter07/functions.xml b/chapter07/functions.xml index 48be12468..3845f0f1d 100644 --- a/chapter07/functions.xml +++ b/chapter07/functions.xml @@ -7,7 +7,6 @@ the following: </para> <literallayout> - <userinput>cat > functions << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/functions @@ -448,7 +447,6 @@ statusproc() # End /etc/init.d/functions <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/halt.xml b/chapter07/halt.xml index 92264f5ab..f3938d17b 100644 --- a/chapter07/halt.xml +++ b/chapter07/halt.xml @@ -7,7 +7,6 @@ following: </para> <literallayout> - <userinput>cat > halt << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/halt @@ -20,7 +19,6 @@ following: # End /etc/init.d/halt <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/hosts.xml b/chapter07/hosts.xml index 787ab47b2..490306a81 100644 --- a/chapter07/hosts.xml +++ b/chapter07/hosts.xml @@ -8,9 +8,7 @@ example is: </para> <blockquote><literallayout> - <my-IP> myhost.mydomain.org aliases - </literallayout></blockquote> <para> @@ -19,12 +17,10 @@ IP-address range. Valid ranges are: </para> <blockquote><literallayout> - Class Networks A 10.0.0.0 B 172.16.0.0 through 172.31.0.0 C 192.168.0.0 through 192.168.255.0 - </literallayout></blockquote> <para> @@ -44,7 +40,6 @@ If a network card is not going to be configured, a new file </para> <literallayout> - <userinput>cat > /etc/hosts << "EOF"</userinput> # Begin /etc/hosts (no network card version) @@ -52,7 +47,6 @@ If a network card is not going to be configured, a new file # End /etc/hosts (no network card version) <userinput>EOF</userinput> - </literallayout> <para> @@ -61,7 +55,6 @@ If a network card is to be configured, a new file </para> <literallayout> - <userinput>cat > /etc/hosts << "EOF"</userinput> # Begin /etc/hosts (network card version) @@ -70,7 +63,6 @@ If a network card is to be configured, a new file # End /etc/hosts (network card version) <userinput>EOF</userinput> - </literallayout> <para> diff --git a/chapter07/loadkeys.xml b/chapter07/loadkeys.xml index 7c9cad9bd..a04b5b1a8 100644 --- a/chapter07/loadkeys.xml +++ b/chapter07/loadkeys.xml @@ -9,7 +9,6 @@ created: </para> <literallayout> - <userinput>cat > loadkeys << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/loadkeys @@ -30,7 +29,6 @@ evaluate_retval # End /etc/init.d/loadkeys <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/localnet-symperm.xml b/chapter07/localnet-symperm.xml index dc71d1f3f..ee0e92140 100644 --- a/chapter07/localnet-symperm.xml +++ b/chapter07/localnet-symperm.xml @@ -7,12 +7,10 @@ running the following commands: </para> <blockquote><literallayout> - <userinput>cd /etc/init.d &&</userinput> <userinput>chmod 754 localnet &&</userinput> <userinput>cd ../rcS.d &&</userinput> <userinput>ln -s ../init.d/localnet S100localnet</userinput> - </literallayout></blockquote> </sect2> diff --git a/chapter07/localnet.xml b/chapter07/localnet.xml index 26bf21919..8ba6480d2 100644 --- a/chapter07/localnet.xml +++ b/chapter07/localnet.xml @@ -7,7 +7,6 @@ the following: </para> <literallayout> - <userinput>cat > /etc/init.d/localnet << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/localnet @@ -50,7 +49,6 @@ esac # End /etc/init.d/localnet <userinput>EOF</userinput> - </literallayout> &c9-localnet-symperm; diff --git a/chapter07/mountfs.xml b/chapter07/mountfs.xml index e084b512e..242924f42 100644 --- a/chapter07/mountfs.xml +++ b/chapter07/mountfs.xml @@ -7,7 +7,6 @@ the following: </para> <literallayout> - <userinput>cat > mountfs << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/mountfs @@ -103,7 +102,6 @@ esac # End /etc/init.d/mountfs <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/network.xml b/chapter07/network.xml index 64d61bd04..2ed3f702b 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -7,9 +7,7 @@ hostname is put in it by running: </para> <blockquote><literallayout> - <userinput>echo "HOSTNAME=lfs" > /etc/sysconfig/network</userinput> - </literallayout></blockquote> <para> diff --git a/chapter07/rc.xml b/chapter07/rc.xml index 7fcf4d71e..2e86e031c 100644 --- a/chapter07/rc.xml +++ b/chapter07/rc.xml @@ -7,7 +7,6 @@ A new file <filename>/etc/init.d/rc</filename> is created containing the following: </para> <literallayout> - <userinput>cat > rc << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/rc @@ -246,7 +245,6 @@ fi # End /etc/init.d/rc <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/rcS.xml b/chapter07/rcS.xml index 7eb6884ab..83b3df9c5 100644 --- a/chapter07/rcS.xml +++ b/chapter07/rcS.xml @@ -7,7 +7,6 @@ new file <filename>/etc/init.d/rcS</filename> containing the following: </para> <literallayout> - <userinput>cat > rcS << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/rcS @@ -36,7 +35,6 @@ done # End /etc/init.d/rcS <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/reboot.xml b/chapter07/reboot.xml index e57410c48..9ce1a6037 100644 --- a/chapter07/reboot.xml +++ b/chapter07/reboot.xml @@ -7,7 +7,6 @@ following: </para> <literallayout> - <userinput>cat > reboot << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/reboot @@ -23,7 +22,6 @@ echo "System reboot in progress..." # End /etc/init.d/reboot <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/sendsignals.xml b/chapter07/sendsignals.xml index 3aff74996..b2ed0c80e 100644 --- a/chapter07/sendsignals.xml +++ b/chapter07/sendsignals.xml @@ -7,7 +7,6 @@ containing the following: </para> <literallayout> - <userinput>cat > sendsignals << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/sendsignals @@ -37,7 +36,6 @@ evaluate_retval # End /etc/init.d/sendsignals <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml index 11809c770..994626de6 100644 --- a/chapter07/setclock.xml +++ b/chapter07/setclock.xml @@ -21,7 +21,6 @@ value of <emphasis>1</emphasis>. </para> <literallayout> - <userinput>cat > setclock << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/setclock @@ -59,7 +58,6 @@ evaluate_retval # End /etc/init.d/setclock <userinput>EOF</userinput> - </literallayout> <sect2> @@ -71,7 +69,6 @@ the following: </para> <literallayout> - <userinput>cat > /etc/sysconfig/clock << "EOF"</userinput> # Begin /etc/sysconfig/clock @@ -79,7 +76,6 @@ UTC=1 # End /etc/sysconfig/clock <userinput>EOF</userinput> - </literallayout> <para> diff --git a/chapter07/symperm.xml b/chapter07/symperm.xml index f8195aea7..d650737ae 100644 --- a/chapter07/symperm.xml +++ b/chapter07/symperm.xml @@ -9,7 +9,6 @@ below. </para> <blockquote><literallayout> - <userinput>cd /etc/init.d &&</userinput> <userinput>chmod 754 rc rcS functions checkfs halt loadkeys mountfs reboot &&</userinput> @@ -42,7 +41,6 @@ below. <userinput>ln -s ../init.d/sysklogd S100sysklogd &&</userinput> <userinput>cd ../rc5.d &&</userinput> <userinput>ln -s ../init.d/sysklogd S100sysklogd</userinput> - </literallayout></blockquote> </sect1> diff --git a/chapter07/sysklogd.xml b/chapter07/sysklogd.xml index bad6e6450..e6a188af0 100644 --- a/chapter07/sysklogd.xml +++ b/chapter07/sysklogd.xml @@ -7,7 +7,6 @@ the following: </para> <literallayout> - <userinput>cat > sysklogd << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/sysklogd @@ -60,7 +59,6 @@ esac # End /etc/init.d/sysklogd <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter07/template.xml b/chapter07/template.xml index 37a1363f2..6a366b6f8 100644 --- a/chapter07/template.xml +++ b/chapter07/template.xml @@ -7,7 +7,6 @@ the following: </para> <literallayout> - <userinput>cat > template << "EOF"</userinput> #!/bin/sh # Begin /etc/init.d/ @@ -53,7 +52,6 @@ esac # End /etc/init.d/ <userinput>EOF</userinput> - </literallayout> </sect1> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 5737df221..54a1efa80 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -10,7 +10,6 @@ following commands are run to build the kernel: </para> <blockquote><literallayout> - <userinput>cd /usr/src/linux &&</userinput> <userinput>make mrproper &&</userinput> <userinput>make menuconfig &&</userinput> @@ -21,7 +20,6 @@ following commands are run to build the kernel: <userinput>cp arch/i386/boot/bzImage /boot/lfskernel && </userinput> <userinput>cp System.map /boot</userinput> - </literallayout></blockquote> <para> diff --git a/chapter08/lilo.xml b/chapter08/lilo.xml index 598eb334f..bacecdc49 100644 --- a/chapter08/lilo.xml +++ b/chapter08/lilo.xml @@ -19,10 +19,8 @@ First we'll exit chroot and copy the lfskernel file to the host system: </para> <blockquote><literallayout> - <userinput>logout</userinput> <userinput>cp $LFS/boot/lfskernel /boot</userinput> - </literallayout></blockquote> <para> @@ -31,14 +29,12 @@ choose LFS when booting the computer: </para> <literallayout> - <userinput>cat >> /etc/lilo.conf << "EOF"</userinput> image=/boot/lfskernel label=lfs root=<partition> read-only <userinput>EOF</userinput> - </literallayout> <para> @@ -50,9 +46,7 @@ Now the boot loader gets updated by running: </para> <blockquote><literallayout> - <userinput>/sbin/lilo</userinput> - </literallayout></blockquote> <para> @@ -61,10 +55,8 @@ LFS system: </para> <blockquote><literallayout> - <userinput>cp /etc/lilo.conf $LFS/etc &&</userinput> <userinput>cp <kernel images> $LFS/boot</userinput> - </literallayout></blockquote> <para> |