diff options
Diffstat (limited to 'chapter06')
61 files changed, 560 insertions, 444 deletions
diff --git a/chapter06/autoconf-inst.xml b/chapter06/autoconf-inst.xml index ac52be9ff..557f6753d 100644 --- a/chapter06/autoconf-inst.xml +++ b/chapter06/autoconf-inst.xml @@ -5,11 +5,13 @@ Install Autoconf by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/automake-inst.xml b/chapter06/automake-inst.xml index 9d3238e77..09a378452 100644 --- a/chapter06/automake-inst.xml +++ b/chapter06/automake-inst.xml @@ -5,10 +5,12 @@ Install Automake by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index ea0e51b00..677a75ece 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -5,24 +5,26 @@ 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> - <userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug - $LFS/bin</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr --with-curses &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>logout</userinput> +<userinput>mv $LFS/usr/bin/bash $LFS/usr/bin/bashbug $LFS/bin</userinput> +</screen> +</para> <para> The static bash is replaced with the dynamic bash and the chroot'ed environment is re-entered by running: </para> -<blockquote><literallayout> - &c6-chrootcmd; -</literallayout></blockquote> +<para> +<screen> +&c6-chrootcmd; +</screen> +</para> </sect2> diff --git a/chapter06/bashprofile.xml b/chapter06/bashprofile.xml index 3e126f32e..b6543425c 100644 --- a/chapter06/bashprofile.xml +++ b/chapter06/bashprofile.xml @@ -14,7 +14,8 @@ Create a new file <filename>$LFS/root/.bash_profile</filename> by running the following. </para> -<literallayout> +<para> +<screen> <userinput>cat > $LFS/root/.bash_profile << "EOF"</userinput> # Begin /root/.bash_profile @@ -25,7 +26,8 @@ export PS1 PATH # End /root/.bash_profile <userinput>EOF</userinput> -</literallayout> +</screen> +</para> <para> The PS1 variable is an environment variable that controls the appearance of diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml index e4d83eaef..cb818beda 100644 --- a/chapter06/bin86-inst.xml +++ b/chapter06/bin86-inst.xml @@ -5,10 +5,12 @@ Install Bin86 by running the following commands: </para> -<blockquote><literallayout> - <userinput>make &&</userinput> - <userinput>make PREFIX=/usr install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>make &&</userinput> +<userinput>make PREFIX=/usr install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index 8710e62d6..f8ea0860a 100644 --- a/chapter06/binutils-inst.xml +++ b/chapter06/binutils-inst.xml @@ -4,12 +4,14 @@ 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> +<para> +<screen> +<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> +</screen> +</para> </sect2> diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml index f5ae99dbe..8d83c0bad 100644 --- a/chapter06/bison-inst.xml +++ b/chapter06/bison-inst.xml @@ -5,13 +5,14 @@ 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> +<screen> +<userinput>./configure --prefix=/usr \</userinput> +<userinput> --datadir=/usr/share/bison &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> <para> Some programs don't know about bison and try to find the yacc program @@ -25,7 +26,8 @@ Create a new file <filename>/usr/bin/yacc</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > /usr/bin/yacc << "EOF"</userinput> #!/bin/sh # Begin /usr/bin/yacc @@ -35,7 +37,8 @@ following: # End /usr/bin/yacc <userinput>EOF</userinput> <userinput>chmod 755 /usr/bin/yacc</userinput> -</literallayout> +</screen> +</para> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 40b27e803..8a9cc2880 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -5,23 +5,25 @@ 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> - <userinput>cp bzip2recover /bin &&</userinput> - <userinput>cp bzip2.1 /usr/share/man/man1 &&</userinput> - <userinput>cp bzlib.h /usr/include &&</userinput> - <userinput>cp -a libbz2.so* libbz2.a /lib &&</userinput> - <userinput>rm /usr/lib/libbz2.a &&</userinput> - <userinput>cd /bin &&</userinput> - <userinput>ln -sf bzip2 bunzip2 &&</userinput> - <userinput>ln -sf bzip2 bzcat &&</userinput> - <userinput>cd /usr/share/man/man1 &&</userinput> - <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> +<screen> +<userinput>make -f Makefile-libbz2_so &&</userinput> +<userinput>make bzip2recover libbz2.a &&</userinput> +<userinput>cp bzip2-shared /bin/bzip2 &&</userinput> +<userinput>cp bzip2recover /bin &&</userinput> +<userinput>cp bzip2.1 /usr/share/man/man1 &&</userinput> +<userinput>cp bzlib.h /usr/include &&</userinput> +<userinput>cp -a libbz2.so* libbz2.a /lib &&</userinput> +<userinput>rm /usr/lib/libbz2.a &&</userinput> +<userinput>cd /bin &&</userinput> +<userinput>ln -sf bzip2 bunzip2 &&</userinput> +<userinput>ln -sf bzip2 bzcat &&</userinput> +<userinput>cd /usr/share/man/man1 &&</userinput> +<userinput>ln -s bzip2.1 bunzip2.1 &&</userinput> +<userinput>ln -s bzip2.1 bzcat.1 &&</userinput> +<userinput>ln -s bzip2.1 bzip2recover.1</userinput> +</screen> +</para> <para> Although it's not strictly a part of a basic LFS system it's worth diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index ca70820f8..c025085dd 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -13,9 +13,11 @@ everything a user does will be restricted to the LFS partition (since / is actually /mnt/lfs but the shell doesn't know that). </para> -<blockquote><literallayout> - &c6-chrootcmd; -</literallayout></blockquote> +<para> +<screen> +&c6-chrootcmd; +</screen> +</para> <para> The -i option will clear all environment variables for as long as you diff --git a/chapter06/chrootcmd.xml b/chapter06/chrootcmd.xml index 5b3229571..79e3a60e2 100644 --- a/chapter06/chrootcmd.xml +++ b/chapter06/chrootcmd.xml @@ -1,4 +1,3 @@ - <userinput>cd $LFS &&</userinput> - <userinput>chroot $LFS /usr/bin/env -i HOME=/root - \</userinput> - <userinput> TERM=$TERM /bin/bash --login</userinput> +<userinput>cd $LFS &&</userinput> +<userinput>chroot $LFS /usr/bin/env -i HOME=/root \</userinput> +<userinput> TERM=$TERM /bin/bash --login</userinput> diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml index cfb1ae441..f5b9787da 100644 --- a/chapter06/config-glibc.xml +++ b/chapter06/config-glibc.xml @@ -12,7 +12,8 @@ Create a new file <filename>/etc/nsswitch.conf</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > /etc/nsswitch.conf << "EOF"</userinput> # Begin /etc/nsswitch.conf @@ -34,7 +35,8 @@ netgroup: db files # End /etc/nsswitch.conf <userinput>EOF</userinput> -</literallayout> +</screen> +</para> <para> The <userinput>tzselect</userinput> script has to be run and the questions @@ -48,11 +50,12 @@ Create the <filename class="directory">/etc/localtime</filename> symlink by running: </para> -<blockquote><literallayout> - <userinput>cd /etc &&</userinput> - <userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> - localtime</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cd /etc &&</userinput> +<userinput>ln -sf ../usr/share/zoneinfo/<tzselect's output> localtime</userinput> +</screen> +</para> <para> tzselect's output can be something like <emphasis>EST5EDT</emphasis> or @@ -63,18 +66,21 @@ tzselect's output can be something like <emphasis>EST5EDT</emphasis> or The symlink you'd create with that information would be: </para> -<blockquote><literallayout> - <userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>ln -sf ../usr/share/zoneinfo/EST5EDT localtime</userinput> +</screen> +</para> <para> Or: </para> -<blockquote><literallayout> - <userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime - </userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>ln -sf ../usr/share/zoneinfo/Canada/Eastern localtime </userinput> +</screen> +</para> </sect2> diff --git a/chapter06/config-ldso.xml b/chapter06/config-ldso.xml index c6189d044..04fb4960e 100644 --- a/chapter06/config-ldso.xml +++ b/chapter06/config-ldso.xml @@ -17,7 +17,8 @@ Create a new file <filename>/etc/ld.so.conf</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > /etc/ld.so.conf << "EOF"</userinput> # Begin /etc/ld.so.conf @@ -27,7 +28,8 @@ following: # End /etc/ld.so.conf <userinput>EOF</userinput> -</literallayout> +</screen> +</para> <para> Although it's not necessary to add the diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml index a10d05784..8202c12bb 100644 --- a/chapter06/config-shadowpwd.xml +++ b/chapter06/config-shadowpwd.xml @@ -15,9 +15,11 @@ be able to work with shadow'ed passwords. To enable shadow'ed passwords, run the following command: </para> -<blockquote><literallayout> - <userinput>/usr/sbin/pwconv</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>/usr/sbin/pwconv</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/config-sysklogd.xml b/chapter06/config-sysklogd.xml index 900010b28..3b52725e3 100644 --- a/chapter06/config-sysklogd.xml +++ b/chapter06/config-sysklogd.xml @@ -5,7 +5,8 @@ Create a new file <filename>/etc/syslog.conf</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > /etc/syslog.conf << "EOF"</userinput> # Begin /etc/syslog.conf @@ -19,7 +20,8 @@ user.* -/var/log/user.log # End /etc/syslog.conf <userinput>EOF</userinput> -</literallayout> +</screen> +</para> </sect2> diff --git a/chapter06/config-sysvinit.xml b/chapter06/config-sysvinit.xml index fafb372f7..bbb2ae51a 100644 --- a/chapter06/config-sysvinit.xml +++ b/chapter06/config-sysvinit.xml @@ -5,7 +5,8 @@ Create a new file <filename>/etc/inittab</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > /etc/inittab << "EOF"</userinput> # Begin /etc/inittab @@ -34,7 +35,8 @@ su:S016:respawn:/sbin/sulogin # End /etc/inittab <userinput>EOF</userinput> -</literallayout> +</screen> +</para> </sect2> diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml index 7e230f1b8..172d67ffc 100644 --- a/chapter06/config-vim.xml +++ b/chapter06/config-vim.xml @@ -7,7 +7,8 @@ have included Vim in this book but the original Vi). Create the <filename>/root/.vimrc</filename> by running the following: </para> -<literallayout> +<para> +<screen> <userinput>cat > /root/.vimrc << "EOF"</userinput> " Begin /root/.vimrc @@ -16,7 +17,8 @@ set bs=2 " End /root/.vimrc <userinput>EOF</userinput> -</literallayout> +</screen> +</para> </sect2> diff --git a/chapter06/create-password.xml b/chapter06/create-password.xml index 71492ffdf..7bbde76f9 100644 --- a/chapter06/create-password.xml +++ b/chapter06/create-password.xml @@ -6,9 +6,11 @@ Choose a password for user root and create it by running the following command: </para> -<blockquote><literallayout> +<para> +<screen> <userinput>passwd root</userinput> -</literallayout></blockquote> +</screen> +</para> </sect2> diff --git a/chapter06/create-utmp.xml b/chapter06/create-utmp.xml index 512172a4d..93a94fb75 100644 --- a/chapter06/create-utmp.xml +++ b/chapter06/create-utmp.xml @@ -15,14 +15,14 @@ Create these files with their proper permissions by running the following commands: </para> -<blockquote><literallayout> - <userinput>touch /var/run/utmp /var/log/wtmp \</userinput> - <userinput> /var/log/btmp - /var/log/lastlog &&</userinput> - <userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput> - <userinput> /var/log/btmp /var/log/lastlog - </userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>touch /var/run/utmp /var/log/wtmp \</userinput> +<userinput> /var/log/btmp /var/log/lastlog &&</userinput> +<userinput>chmod 644 /var/run/utmp /var/log/wtmp \</userinput> +<userinput> /var/log/btmp /var/log/lastlog</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/diffutils-inst.xml b/chapter06/diffutils-inst.xml index 7a6bd1607..7b3bf5ecd 100644 --- a/chapter06/diffutils-inst.xml +++ b/chapter06/diffutils-inst.xml @@ -5,11 +5,13 @@ Install Diffutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index a7ba507d7..39c263be4 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -10,14 +10,16 @@ Please note that the empty --with-root-prefix= option below is supposed 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> - <userinput>mv /usr/sbin/mklost+found /sbin</userinput> -</literallayout></blockquote> +<para> +<screen> +<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> +<userinput>mv /usr/sbin/mklost+found /sbin</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 1cafca834..8c582413f 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -5,12 +5,14 @@ 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> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index d3d9566cc..0a084a542 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -5,12 +5,13 @@ 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> +<screen> +<userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> <para> File uses magic numbers to determine a file type. These magic numbers come with @@ -26,9 +27,11 @@ compile this file, because it's faster, fixes that annoying warning and is how it was meant to be: </para> -<blockquote><literallayout> - <userinput>file -C</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>file -C</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index 4766fc44c..aa882500c 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -5,13 +5,14 @@ Install Fileutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr --bindir=/bin \</userinput> - <userinput> --libexecdir=/bin - &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr --bindir=/bin \</userinput> +<userinput> --libexecdir=/bin &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/findutils-inst.xml b/chapter06/findutils-inst.xml index cfb308bfb..167930c3a 100644 --- a/chapter06/findutils-inst.xml +++ b/chapter06/findutils-inst.xml @@ -9,12 +9,14 @@ Before Findutils is installed the findutils patch file has to be unpacked. 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> +<para> +<screen> +<userinput>patch -Np1 -i ../findutils-4.1.patch &&</userinput> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make libexecdir=/usr/bin install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/flex-inst.xml b/chapter06/flex-inst.xml index a14173da8..efe1801bc 100644 --- a/chapter06/flex-inst.xml +++ b/chapter06/flex-inst.xml @@ -5,13 +5,15 @@ 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> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd /usr/bin &&</userinput> +<userinput>ln -s flex lex</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 284397554..15e03c85f 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -15,17 +15,17 @@ Note: the build of other compilers is not tested by the people who actively work on LFS. </para> -<blockquote><literallayout> - <userinput>mkdir /usr/src/gcc-build &&</userinput> - <userinput>cd /usr/src/gcc-build &&</userinput> - <userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> - <userinput> --with-slibdir=/lib - --enable-shared \</userinput> - <userinput> --enable-languages=c,c++ - &&</userinput> - <userinput>make bootstrap &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mkdir /usr/src/gcc-build &&</userinput> +<userinput>cd /usr/src/gcc-build &&</userinput> +<userinput>../gcc-&gcc-version;/configure --prefix=/usr \</userinput> +<userinput> --with-slibdir=/lib --enable-shared \</userinput> +<userinput> --enable-languages=c,c++ &&</userinput> +<userinput>make bootstrap &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/gettext-inst.xml b/chapter06/gettext-inst.xml index 228d2dc93..25f3f58fa 100644 --- a/chapter06/gettext-inst.xml +++ b/chapter06/gettext-inst.xml @@ -5,11 +5,13 @@ Install Gettext by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index a8c94ce2a..62335ac32 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -10,34 +10,28 @@ Unpack the glibc-linuxthreads in the glibc-&glibc-version; directory, not in 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> - <userinput>cd /usr/src/glibc-build &&</userinput> - <userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \</userinput> - <userinput> ../glibc-&glibc-version;/malloc/Makefile - > tmp~ &&</userinput> - <userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile && - </userinput> - <userinput>sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile - > tmp~ && </userinput> - <userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile && - </userinput> - <userinput>../glibc-&glibc-version;/configure \</userinput> - <userinput> --prefix=/usr --enable-add-ons - \</userinput> - <userinput> --libexecdir=/usr/bin && - </userinput> - <userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ - \</userinput> - <userinput> config.make > config.make~ - &&</userinput> - <userinput>mv config.make~ config.make &&</userinput> - <userinput>make &&</userinput> - <userinput>make install &&</userinput> - <userinput>make localedata/install-locales</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> +<userinput>touch /etc/ld.so.conf &&</userinput> +<userinput>mkdir /usr/src/glibc-build &&</userinput> +<userinput>cd /usr/src/glibc-build &&</userinput> +<userinput>sed s/"\$(PERL)"/"\/usr\/bin\/perl"/ \</userinput> +<userinput> ../glibc-&glibc-version;/malloc/Makefile > tmp~ &&</userinput> +<userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile &&</userinput> +<userinput>sed "s/root/0/" ../glibc-&glibc-version;/login/Makefile > tmp~ &&</userinput> +<userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile &&</userinput> +<userinput>../glibc-&glibc-version;/configure \</userinput> +<userinput> --prefix=/usr --enable-add-ons \</userinput> +<userinput> --libexecdir=/usr/bin &&</userinput> +<userinput>sed s/"cross-compiling = yes"/"cross-compiling = no"/ \</userinput> +<userinput> config.make > config.make~ &&</userinput> +<userinput>mv config.make~ config.make &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>make localedata/install-locales</userinput> +</screen> +</para> <para> During the configure stage you will see the following warning: @@ -69,10 +63,12 @@ to ensure a properly working bash. Run the following commands to accomplish this: </para> -<blockquote><literallayout> - <userinput>logout</userinput> - &c6-chrootcmd; -</literallayout></blockquote> +<para> +<screen> +<userinput>logout</userinput> +&c6-chrootcmd; +</screen> +</para> </sect2> diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml index 8b48c2c42..477df7476 100644 --- a/chapter06/grep-inst.xml +++ b/chapter06/grep-inst.xml @@ -5,11 +5,13 @@ Install Grep by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml index 03857f25e..5a00d4fd8 100644 --- a/chapter06/groff-inst.xml +++ b/chapter06/groff-inst.xml @@ -5,12 +5,13 @@ Install Groff by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr && - </userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 6af228e10..08b03a3a7 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -5,19 +5,21 @@ Install Gzip 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 gzip /bin &&</userinput> - <userinput>rm gunzip zcat &&</userinput> - <userinput>cd /bin &&</userinput> - <userinput>ln -sf gzip gunzip &&</userinput> - <userinput>ln -s gzip zcat &&</userinput> - <userinput>ln -s gzip compress &&</userinput> - <userinput>ln -s gunzip uncompress</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd /usr/bin &&</userinput> +<userinput>mv gzip /bin &&</userinput> +<userinput>rm gunzip zcat &&</userinput> +<userinput>cd /bin &&</userinput> +<userinput>ln -sf gzip gunzip &&</userinput> +<userinput>ln -s gzip zcat &&</userinput> +<userinput>ln -s gzip compress &&</userinput> +<userinput>ln -s gunzip uncompress</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index adc5e3443..b6b8e1aec 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -5,13 +5,14 @@ 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> +<screen> +<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> +</screen> +</para> <para> Now we have to choose a default keymap. Explore the @@ -19,10 +20,12 @@ Now we have to choose a default keymap. Explore the 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> +<screen> +<userinput>cd /usr/share/kbd/keymaps &&</userinput> +<userinput>ln -s <path-to-keymap> defkeymap.map.gz</userinput> +</screen> +</para> <para> Replace <userinput><path-to-keymap></userinput> with the path to the diff --git a/chapter06/less-inst.xml b/chapter06/less-inst.xml index f4804c6aa..1750d22ec 100644 --- a/chapter06/less-inst.xml +++ b/chapter06/less-inst.xml @@ -5,11 +5,13 @@ 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> +<para> +<screen> +<userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/libtool-inst.xml b/chapter06/libtool-inst.xml index 6e41a07d3..8e5333702 100644 --- a/chapter06/libtool-inst.xml +++ b/chapter06/libtool-inst.xml @@ -5,11 +5,13 @@ Install Libtool by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml index 790a3d62a..e4c8a2b13 100644 --- a/chapter06/lilo-inst.xml +++ b/chapter06/lilo-inst.xml @@ -13,10 +13,12 @@ http://archive.linuxfromscratch.org/lfs-hints/grub-howto.txt</ulink>, Install Lilo by running the following commands: </para> -<blockquote><literallayout> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> <para> It appears that compilation of this package fails on certain machines diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml index c372d5df0..3c20e2a6e 100644 --- a/chapter06/m4-inst.xml +++ b/chapter06/m4-inst.xml @@ -5,11 +5,13 @@ 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> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> <para> If the base system is running a 2.0 kernel and the Glibc version is @@ -29,13 +31,15 @@ To create a statically linked version of M4, execute the following commands: </para> -<blockquote><literallayout> +<para> +<screen> <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> +</screen> +</para> <para> Now the chroot'ed environment can be re-entered and the @@ -44,9 +48,11 @@ this can be done after having rebooted into the LFS system rather than chrooting into it. </para> -<blockquote><literallayout> - &c6-chrootcmd; -</literallayout></blockquote> +<para> +<screen> +&c6-chrootcmd; +</screen> +</para> </sect2> diff --git a/chapter06/make-inst.xml b/chapter06/make-inst.xml index e4e50076a..ebf668ae6 100644 --- a/chapter06/make-inst.xml +++ b/chapter06/make-inst.xml @@ -5,11 +5,13 @@ Install Make by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index e13002d82..f59a1a23b 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -10,13 +10,14 @@ won't create a directory for you to cd into. Create the device files by running the following commands: </para> -<blockquote><literallayout> - <userinput>cp MAKEDEV-1.1 /dev/MAKEDEV && - </userinput> - <userinput>cd /dev &&</userinput> - <userinput>chmod 755 MAKEDEV &&</userinput> - <userinput>./MAKEDEV -v generic</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>cp MAKEDEV-1.1 /dev/MAKEDEV &&</userinput> +<userinput>cd /dev &&</userinput> +<userinput>chmod 755 MAKEDEV &&</userinput> +<userinput>./MAKEDEV -v generic</userinput> +</screen> +</para> <para> MAKEDEV will create hda[1-20] and hdb[1-20] and such but keep in mind diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index d29d95edf..6126fbea0 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -5,13 +5,14 @@ Before Man is installed, the man patch file needs to be unpacked. </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../man-&man-version;.patch - &&</userinput> - <userinput>./configure -default &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../man-&man-version;.patch &&</userinput> +<userinput>./configure -default &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> <para> You may want to take a look at the man hint at <ulink diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml index cf0fbd8bb..67ce29201 100644 --- a/chapter06/manpages-inst.xml +++ b/chapter06/manpages-inst.xml @@ -5,11 +5,12 @@ Install Man-pages by running the following command: </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch - &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../man-pages-&man-pages-version;.patch &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml index a04a4c4d0..631ea0511 100644 --- a/chapter06/mawk-inst.xml +++ b/chapter06/mawk-inst.xml @@ -5,15 +5,16 @@ Install Mawk by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure &&</userinput> - <userinput>make &&</userinput> - <userinput>make BINDIR=/usr/bin \</userinput> - <userinput> MANDIR=/usr/share/man/man1 install - &&</userinput> - <userinput>cd /usr/bin &&</userinput> - <userinput>ln -s mawk awk</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure &&</userinput> +<userinput>make &&</userinput> +<userinput>make BINDIR=/usr/bin \</userinput> +<userinput> MANDIR=/usr/share/man/man1 install &&</userinput> +<userinput>cd /usr/bin &&</userinput> +<userinput>ln -s mawk awk</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/modutils-inst.xml b/chapter06/modutils-inst.xml index af482dedb..dbe9e8480 100644 --- a/chapter06/modutils-inst.xml +++ b/chapter06/modutils-inst.xml @@ -11,11 +11,13 @@ downgrade to modutils 2.4.5 which seems to be working better. Install Modutils by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 95f98615a..b5433a0fe 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -5,15 +5,15 @@ Install Ncurses by running the following commands: </para> -<blockquote><literallayout> - <userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch - &&</userinput> - <userinput>./configure --prefix=/usr --libdir=/lib \</userinput> - <userinput> --with-shared - --disable-termcap &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -F10 -i ../ncurses-&ncurses-version;.patch &&</userinput> +<userinput>./configure --prefix=/usr --libdir=/lib \</userinput> +<userinput> --with-shared --disable-termcap &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index e631d2e56..9860311d1 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -5,14 +5,15 @@ Install Netkit-base by running the following commands: </para> -<blockquote><literallayout> - - <userinput>./configure &&</userinput> - <userinput>make &&</userinput> - <userinput>make install &&</userinput> - <userinput>cd etc.sample &&</userinput> - <userinput>cp services protocols /etc</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd etc.sample &&</userinput> +<userinput>cp services protocols /etc</userinput> +</screen> +</para> <para> There are other files in the <filename diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index 31c14d39b..37fd86d0d 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -5,10 +5,12 @@ Install Net-tools by running the following commands: </para> -<blockquote><literallayout> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml index e4a570eb2..ff9c2a365 100644 --- a/chapter06/patch-inst.xml +++ b/chapter06/patch-inst.xml @@ -5,11 +5,13 @@ Install Patch by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/perl-inst.xml b/chapter06/perl-inst.xml index fcf1938bd..1e7e28015 100644 --- a/chapter06/perl-inst.xml +++ b/chapter06/perl-inst.xml @@ -5,11 +5,13 @@ 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> +<screen> +<userinput>./Configure -Dprefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> <para> If you don't want to answer all those questions Perl asks, you can @@ -19,11 +21,13 @@ after the config.sh file has been created you can pass the -e parameter 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> +<para> +<screen> +<userinput>./Configure -Dprefix=/usr -d -e &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml index e7ace1191..dde3916cb 100644 --- a/chapter06/procinfo-inst.xml +++ b/chapter06/procinfo-inst.xml @@ -5,11 +5,12 @@ 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> +<para> +<screen> +<userinput>sed "s/-ltermcap/-lncurses/" Makefile | make -f - &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 3c93dc08f..65b1fd107 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -5,12 +5,13 @@ 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> +<para> +<screen> +<userinput>make &&</userinput> +<userinput>make XSCPT='' install &&</userinput> +<userinput>mv /usr/bin/kill /bin</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml index 556b82f56..b8194286a 100644 --- a/chapter06/psmisc-inst.xml +++ b/chapter06/psmisc-inst.xml @@ -5,11 +5,13 @@ Install Psmisc by running the following commands: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml index 0e2d138af..dfba1e670 100644 --- a/chapter06/removeoldnss.xml +++ b/chapter06/removeoldnss.xml @@ -7,9 +7,11 @@ LFS system (because the normal system runs glibc-2.0) it's time to remove them now by running: </para> -<blockquote><literallayout> - <userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput> +</screen> +</para> </sect1> diff --git a/chapter06/sed-inst.xml b/chapter06/sed-inst.xml index 010b7f17d..795d72926 100644 --- a/chapter06/sed-inst.xml +++ b/chapter06/sed-inst.xml @@ -5,11 +5,13 @@ 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> +<para> +<screen> +<userinput>./configure --prefix=/usr --bindir=/bin &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 15f94eb7c..668d6dca4 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -5,16 +5,17 @@ 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> - <userinput>make install &&</userinput> - <userinput>cd etc &&</userinput> - <userinput>cp limits login.access /etc &&</userinput> - <userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > - /etc/login.defs</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../shadow-20001016.patch &&</userinput> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd etc &&</userinput> +<userinput>cp limits login.access /etc &&</userinput> +<userinput>sed "s|/var/spool/mail|/var/mail|" login.defs.linux > /etc/login.defs</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 7ecf22d7c..4e24c3af6 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -5,14 +5,16 @@ 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> +<para> +<screen> +<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> +</screen> +</para> </sect2> @@ -28,9 +30,11 @@ the bash interpreter, but the FHS dictates that there should be a <filename>/usr/bin</filename> directory: </para> -<blockquote><literallayout> - <userinput>ln -s test [</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>ln -s test [</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/sysklogd-inst.xml b/chapter06/sysklogd-inst.xml index 4e669586a..42beb3342 100644 --- a/chapter06/sysklogd-inst.xml +++ b/chapter06/sysklogd-inst.xml @@ -5,10 +5,12 @@ Install Sysklogd by running the following commands: </para> -<blockquote><literallayout> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 544ea3669..846c28944 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -17,18 +17,22 @@ processes started by init the TERM signal". Apply the patch by running the following command: </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../sysvinit-2.78.patch</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../sysvinit-2.78.patch</userinput> +</screen> +</para> <para> Install Sysvinit by running the following commands: </para> -<blockquote><literallayout> - <userinput>make -C src &&</userinput> - <userinput>make -C src install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>make -C src &&</userinput> +<userinput>make -C src install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml index 6c779cdb4..9473d3189 100644 --- a/chapter06/tar-inst.xml +++ b/chapter06/tar-inst.xml @@ -13,24 +13,27 @@ for gzip files). 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> +<screen> +<userinput>cd src &&</userinput> +<userinput>patch -i ../../gnutarpatch.txt &&</userinput> +<userinput>cd ..</userinput> +</screen> +</para> <para> Install Tar by running the following commands from the toplevel directory: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr --libexecdir=/usr/bin - \</userinput> - <userinput> --bindir=/bin &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr --libexecdir=/usr/bin \</userinput> + <userinput>--bindir=/bin &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/texinfo-inst.xml b/chapter06/texinfo-inst.xml index fee8ec74d..9eadf1ea0 100644 --- a/chapter06/texinfo-inst.xml +++ b/chapter06/texinfo-inst.xml @@ -5,14 +5,15 @@ Install Texinfo by running the following commands: </para> -<blockquote><literallayout> - <userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch - &&</userinput> - <userinput>./configure --prefix=/usr &&</userinput> - <userinput>make &&</userinput> - <userinput>make install &&</userinput> - <userinput>make TEXMF=/usr/share/texmf install-tex</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>patch -Np1 -i ../texinfo-&texinfo-version;.patch &&</userinput> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>make TEXMF=/usr/share/texmf install-tex</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index 76e401f10..0cba4145f 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -5,12 +5,14 @@ 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> +<para> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>mv /usr/bin/cat /bin</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index da409fc8f..55a9c4fc9 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -7,14 +7,15 @@ file, instead of the usual /etc. To make hwclock, which is part of the util-linux package, FHS-compliant, run the following. </para> -<blockquote><literallayout> - <userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" - \</userinput> - <userinput> hwclock/hwclock.c > hwclock~ - &&</userinput> - <userinput>mv hwclock~ hwclock/hwclock.c &&</userinput> - <userinput>mkdir /var/lib/hwclock</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>sed "s|etc/adjtime\"\$|var/lib/hwclock/adjtime\"|" \</userinput> +<userinput> hwclock/hwclock.c > hwclock~ &&</userinput> +<userinput>mv hwclock~ hwclock/hwclock.c &&</userinput> +<userinput>mkdir /var/lib/hwclock</userinput> +</screen> +</para> + </sect2> <sect2> @@ -24,15 +25,16 @@ util-linux package, FHS-compliant, run the following. 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> - <userinput>mv MCONFIG~ MCONFIG &&</userinput> - <userinput>./configure &&</userinput> - <userinput>make &&</userinput> - <userinput>make install</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>sed s/HAVE_SLN=no/HAVE_SLN=yes/ \</userinput> +<userinput> MCONFIG > MCONFIG~ &&</userinput> +<userinput>mv MCONFIG~ MCONFIG &&</userinput> +<userinput>./configure &&</userinput> +<userinput>make &&</userinput> +<userinput>make install</userinput> +</screen> +</para> </sect2> diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 4f50750b5..49424450d 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -18,13 +18,15 @@ won't overwrite any files from the other package. So it doesn't matter 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> +<screen> +<userinput>./configure --prefix=/usr &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd /usr/bin &&</userinput> +<userinput>ln -s vim vi</userinput> +</screen> +</para> <para> If you plan on installing the X Window system on your LFS @@ -46,14 +48,16 @@ conform to the FHS, you should use this command set instead of the one presented above: </para> -<blockquote><literallayout> - <userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> - <userinput>make &&</userinput> - <userinput>make install &&</userinput> - <userinput>cd /usr/bin &&</userinput> - <userinput>ln -s vim vi &&</userinput> - <userinput>mkdir /var/lib/vim</userinput> -</literallayout></blockquote> +<para> +<screen> +<userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> +<userinput>make &&</userinput> +<userinput>make install &&</userinput> +<userinput>cd /usr/bin &&</userinput> +<userinput>ln -s vim vi &&</userinput> +<userinput>mkdir /var/lib/vim</userinput> +</screen> +</para> </sect2> |