diff options
| -rw-r--r-- | chapter05/fileutils-exp.xml | 2 | ||||
| -rw-r--r-- | chapter05/fileutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter05/gzip-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/bzip2-inst.xml | 14 | ||||
| -rw-r--r-- | chapter06/file-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/glibc-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/netkitbase-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd-inst.xml | 2 | ||||
| -rw-r--r-- | chapter08/kernel.xml | 4 | ||||
| -rw-r--r-- | chapter08/lilo.xml | 6 |
11 files changed, 22 insertions, 22 deletions
diff --git a/chapter05/fileutils-exp.xml b/chapter05/fileutils-exp.xml index 8f77ba49c..2a117d4e4 100644 --- a/chapter05/fileutils-exp.xml +++ b/chapter05/fileutils-exp.xml @@ -5,7 +5,7 @@ run this command in order to keep a backup of the file we are about to change.</para> -<para><screen><userinput>cp -f lib/Makefile.in lib/Makefile.in.backup &&</userinput> +<para><screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &&</userinput> <userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput> <userinput> -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput> <userinput> lib/Makefile.in > lib/Makefile.in~ &&</userinput> diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index 2dca914a6..39b07067d 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -7,7 +7,7 @@ limited to, Linux systems that run Glibc-2.2.3 with an AMD CPU (Athlons and Durons are the most reported used CPU's). If you are in this category, run the following to sed commands before you compile this package. -<screen><userinput>cp -f lib/Makefile.in lib/Makefile.in.backup &&</userinput> +<screen><userinput>cp lib/Makefile.in lib/Makefile.in.backup &&</userinput> <userinput>sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \</userinput> <userinput> -e 's/\(.*\)\(idcache\$U\.\$.*\)\\/\1\2atexit$U.$(OBJEXT) \\/' \</userinput> <userinput> lib/Makefile.in > lib/Makefile.in~ &&</userinput> diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 478d68caa..20f227158 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -8,7 +8,7 @@ unpacked.</para> <userinput>./configure --prefix=$LFS/usr &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> -<userinput>cp -f $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &&</userinput> +<userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &&</userinput> <userinput>rm -f $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 4e6ca8e03..9c2f003d0 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -5,13 +5,13 @@ <para><screen><userinput>make -f Makefile-libbz2_so &&</userinput> <userinput>make bzip2recover libbz2.a &&</userinput> -<userinput>cp -f bzip2-shared /bin/bzip2 &&</userinput> -<userinput>cp -f bzip2recover /bin &&</userinput> -<userinput>cp -f bzip2.1 /usr/share/man/man1 &&</userinput> -<userinput>cp -f bzlib.h /usr/include &&</userinput> -<userinput>cp -af libbz2.so* /lib &&</userinput> -<userinput>rm -f /usr/lib/libbz2.a &&</userinput> -<userinput>cp -f libbz2.a /usr/lib &&</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* /lib &&</userinput> +<userinput>rm /usr/lib/libbz2.a &&</userinput> +<userinput>cp libbz2.a /usr/lib &&</userinput> <userinput>cd /usr/lib &&</userinput> <userinput>ln -sf ../../lib/libbz2.so &&</userinput> <userinput>cd /bin &&</userinput> diff --git a/chapter06/file-inst.xml b/chapter06/file-inst.xml index 9602cfd04..c1424dc4e 100644 --- a/chapter06/file-inst.xml +++ b/chapter06/file-inst.xml @@ -6,7 +6,7 @@ break is placed exactly where it is in the book. Don't try and put it all on one line otherwise it won't work. Install File by running the following commands:</para> -<para><screen><userinput>cp -f readelf.h readelf.h.backup &&</userinput> +<para><screen><userinput>cp readelf.h readelf.h.backup &&</userinput> <userinput>sed '/#define __/a \</userinput> <userinput> #include <stdint.h>' readelf.h.backup > readelf.h &&</userinput> <userinput>./configure --prefix=/usr --datadir=/usr/share/misc &&</userinput> diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index d6713c964..9a1029eba 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -10,17 +10,17 @@ would do.</para> <para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &&</userinput> <userinput>touch /etc/ld.so.conf &&</userinput> -<userinput>cp -f malloc/Makefile malloc/Makefile.backup &&</userinput> +<userinput>cp malloc/Makefile malloc/Makefile.backup &&</userinput> <userinput>sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile > tmp~ &&</userinput> <userinput>mv -f tmp~ malloc/Makefile &&</userinput> -<userinput>cp -f login/Makefile login/Makefile.backup &&</userinput> +<userinput>cp login/Makefile login/Makefile.backup &&</userinput> <userinput>sed 's/root/0/' login/Makefile > tmp~ &&</userinput> <userinput>mv -f tmp~ login/Makefile &&</userinput> <userinput>mkdir ../glibc-build &&</userinput> <userinput>cd ../glibc-build &&</userinput> <userinput>../glibc-&glibc-version;/configure --prefix=/usr \</userinput> <userinput> --enable-add-ons --libexecdir=/usr &&</userinput> -<userinput>cp -f config.make config.make.backup &&</userinput> +<userinput>cp config.make config.make.backup &&</userinput> <userinput>sed 's/cross-compiling = yes/cross-compiling = no/' \</userinput> <userinput> config.make > tmp~ &&</userinput> <userinput>mv -f tmp~ config.make &&</userinput> diff --git a/chapter06/netkitbase-inst.xml b/chapter06/netkitbase-inst.xml index 36f546600..c4cc5d3ce 100644 --- a/chapter06/netkitbase-inst.xml +++ b/chapter06/netkitbase-inst.xml @@ -7,7 +7,7 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc.sample &&</userinput> -<userinput>cp -f services protocols /etc</userinput></screen></para> +<userinput>cp services protocols /etc</userinput></screen></para> <para>There are other files in the <filename class="directory">etc.sample</filename> directory which might be of diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml index 97d4497d7..c861d071f 100644 --- a/chapter06/shadowpwd-exp.xml +++ b/chapter06/shadowpwd-exp.xml @@ -6,7 +6,7 @@ compilation bug which occurs due to a variable (nflg), being used but not defined.</para> -<para><userinput>cp -f limits login.access and others:</userinput> These files +<para><userinput>cp limits login.access and others:</userinput> These files were not installed during the installation of the package so we copy them manually as those files are used to configure authentication details on the system.</para> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 8f6c1f529..9ce63bbbd 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -12,7 +12,7 @@ following commands:</para> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd etc &&</userinput> -<userinput>cp -f limits login.access /etc &&</userinput> +<userinput>cp limits login.access /etc &&</userinput> <userinput>sed 's%/var/spool/mail%/var/mail%' login.defs.linux > /etc/login.defs</userinput> <userinput>cd /lib &&</userinput> <userinput>mv libshadow.a /usr/lib &&</userinput> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 5682b23ce..93616833d 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -25,8 +25,8 @@ make menuconfig.</para> <userinput>make bzImage &&</userinput> <userinput>make modules &&</userinput> <userinput>make modules_install &&</userinput> -<userinput>cp -f arch/i386/boot/bzImage /boot/lfskernel &&</userinput> -<userinput>cp -f System.map /boot</userinput></screen></para> +<userinput>cp arch/i386/boot/bzImage /boot/lfskernel &&</userinput> +<userinput>cp System.map /boot</userinput></screen></para> <para>Note: the arch/i386/boot/bzImage path may vary on different platforms.</para> diff --git a/chapter08/lilo.xml b/chapter08/lilo.xml index d49e6a051..1c57dada6 100644 --- a/chapter08/lilo.xml +++ b/chapter08/lilo.xml @@ -14,7 +14,7 @@ the host system or the LFS system).</para> system:</para> <para><screen><userinput>logout</userinput> -<userinput>cp -f $LFS/boot/lfskernel /boot</userinput></screen></para> +<userinput>cp $LFS/boot/lfskernel /boot</userinput></screen></para> <para>The next step is adding an entry to /etc/lilo.conf so that we can choose LFS when booting the computer:</para> @@ -40,8 +40,8 @@ the line <userinput>read-only</userinput> should be changed to <para>The last step is syncing the host system lilo config. files with the LFS system:</para> -<para><screen><userinput>cp -f /etc/lilo.conf $LFS/etc &&</userinput> -<userinput>cp -f <kernel images> $LFS/boot</userinput></screen></para> +<para><screen><userinput>cp /etc/lilo.conf $LFS/etc &&</userinput> +<userinput>cp <kernel images> $LFS/boot</userinput></screen></para> <para>To find out which kernel images files are being used, look at the /etc/lilo.conf file and find the lines starting with |