diff options
| -rw-r--r-- | chapter05/bzip2-inst.xml | 2 | ||||
| -rw-r--r-- | chapter05/gzip-inst.xml | 2 | ||||
| -rw-r--r-- | chapter05/shellutils-inst.xml | 4 | ||||
| -rw-r--r-- | chapter05/textutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/e2fsprogs-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/ed-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/glibc-exp.xml | 6 | ||||
| -rw-r--r-- | chapter06/glibc-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/gzip-inst.xml | 4 | ||||
| -rw-r--r-- | chapter06/kbd-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/kbd-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/man-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/nettools-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/procps-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/removeoldnss.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/shellutils-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/sysvinit-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/textutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/utillinux-inst.xml | 2 | ||||
| -rw-r--r-- | chapter07/functions.xml | 4 | ||||
| -rw-r--r-- | chapter07/mountfs.xml | 2 |
22 files changed, 31 insertions, 31 deletions
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 0490f0398..aa5d87dd8 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>make CC="gcc -static" &&</userinput> <userinput>make PREFIX=$LFS/usr install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> -<userinput>mv -f bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para> +<userinput>mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 20f227158..8d19c3cbb 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -9,7 +9,7 @@ unpacked.</para> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</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> +<userinput>rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip</userinput></screen></para> </sect2> diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 1e28737ed..5f83c1a80 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -9,8 +9,8 @@ to be unpacked.</para> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> <userinput>cd $LFS/usr/bin &&</userinput> -<userinput>mv -f date echo false pwd stty $LFS/bin &&</userinput> -<userinput>mv -f su true uname hostname $LFS/bin</userinput></screen></para> +<userinput>mv date echo false pwd stty $LFS/bin &&</userinput> +<userinput>mv su true uname hostname $LFS/bin</userinput></screen></para> <para>The patch file only needs to be applied if you are running glibc-2.1.x on your base system.</para> diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index 80f8e1d4c..fc56d6f8d 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &&</userinput> <userinput>make LDFLAGS=-static &&</userinput> <userinput>make install &&</userinput> -<userinput>mv -f $LFS/usr/bin/cat $LFS/bin</userinput></screen></para> +<userinput>mv $LFS/usr/bin/cat $LFS/bin</userinput></screen></para> </sect2> diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml index 2bba4eb80..e5399db99 100644 --- a/chapter06/e2fsprogs-inst.xml +++ b/chapter06/e2fsprogs-inst.xml @@ -11,7 +11,7 @@ to be like that. We did not forget to supply a value there.</para> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make install-libs &&</userinput> -<userinput>mv -f /usr/sbin/mklost+found /sbin</userinput></screen></para> +<userinput>mv /usr/sbin/mklost+found /sbin</userinput></screen></para> </sect2> diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 052d8ab0f..c588b1f2a 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -11,7 +11,7 @@ <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv -f /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> +<userinput>mv /usr/bin/ed /usr/bin/red /bin</userinput></screen></para> </sect2> diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml index 5a3e71852..e63c2e61b 100644 --- a/chapter06/glibc-exp.xml +++ b/chapter06/glibc-exp.xml @@ -21,7 +21,7 @@ file <filename>tmp~</filename>. This is done because Glibc can't autodetect perl since it's not installed yet at the time when we install Glibc.</para> -<para><userinput>mv -f tmp~ malloc/Makefile:</userinput> The file +<para><userinput>mv tmp~ malloc/Makefile:</userinput> The file <filename>tmp~</filename> is now moved back to <filename>malloc/Makefile</filename>. We do this because when using sed, we can't write straight back to this file so we need to @@ -35,7 +35,7 @@ because as we don't have glibc on the LFS system yet, usernames can't be resolved to their user id's. Therefore, we replace the username root with the id 0. </para> -<para><userinput>mv -f tmp~ login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the +<para><userinput>mv tmp~ login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the edited Makefile and then copying it back over the original.</para> <para><userinput>--enable-add-ons:</userinput> This enables the add-on that @@ -52,7 +52,7 @@ test program to determine this, so it automatically defaults to a cross-compiler. The reason for the failed program is because Glibc hasn't been installed yet.</para> -<para><userinput>mv -f config.make~ config.make:</userinput> Again, we are moving +<para><userinput>mv config.make~ config.make:</userinput> Again, we are moving the temporary file over the original.</para> <para><userinput>exec /bin/bash:</userinput>This command will diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index 9a1029eba..f4930add2 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -12,10 +12,10 @@ would do.</para> <userinput>touch /etc/ld.so.conf &&</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>mv tmp~ malloc/Makefile &&</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>mv tmp~ login/Makefile &&</userinput> <userinput>mkdir ../glibc-build &&</userinput> <userinput>cd ../glibc-build &&</userinput> <userinput>../glibc-&glibc-version;/configure --prefix=/usr \</userinput> @@ -23,7 +23,7 @@ would do.</para> <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> +<userinput>mv tmp~ config.make &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>make localedata/install-locales &&</userinput> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 2763417e2..4614a2e8c 100644 --- a/chapter06/gzip-inst.xml +++ b/chapter06/gzip-inst.xml @@ -7,8 +7,8 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>mv -f gzip /bin &&</userinput> -<userinput>rm -f gunzip zcat &&</userinput> +<userinput>mv gzip /bin &&</userinput> +<userinput>rm gunzip zcat &&</userinput> <userinput>cd /bin &&</userinput> <userinput>ln -sf gzip gunzip &&</userinput> <userinput>ln -sf gzip zcat &&</userinput> diff --git a/chapter06/kbd-exp.xml b/chapter06/kbd-exp.xml index 2cd5c9cba..a4260d5db 100644 --- a/chapter06/kbd-exp.xml +++ b/chapter06/kbd-exp.xml @@ -5,7 +5,7 @@ data files (fonts, keymaps, and such) in the /usr/share/kbd directory, as the FHS suggests.</para> -<para><userinput>rm -f +<para><userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz:</userinput> We remove this file because we don't know which keymap you need to use. We will be defining the default keymap in diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index f6211bddd..27799dd47 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>./configure --datadir=/usr/share/kbd &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>rm -f /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para> +<userinput>rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz</userinput></screen></para> </sect2> diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 3b624f92f..f004b51a3 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -7,7 +7,7 @@ <userinput>do</userinput> <userinput> cp $i $i.backup &&</userinput> <userinput> sed 's/gawk/awk/g' $i > tmp~ &&</userinput> -<userinput> mv -f tmp~ $i</userinput> +<userinput> mv tmp~ $i</userinput> <userinput>done</userinput> <userinput>chmod 700 configure &&</userinput> <userinput>./configure -default &&</userinput> diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index b1eaabed4..0f64b7647 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -9,7 +9,7 @@ <para>Net-tools <userinput>hostname</userinput> replaces that which was originally installed by sh-utils. Sometimes the sh-utils version gets left behind as /bin/hostname.old so you may wish to remove it by running -<userinput>rm -f /bin/hostname.old</userinput></para> +<userinput>rm /bin/hostname.old</userinput></para> </sect2> diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 0b86b02fa..29ff3d5f6 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -5,7 +5,7 @@ <para><screen><userinput>make &&</userinput> <userinput>make XSCPT='' install &&</userinput> -<userinput>mv -f /usr/bin/kill /bin</userinput></screen></para> +<userinput>mv /usr/bin/kill /bin</userinput></screen></para> </sect2> diff --git a/chapter06/removeoldnss.xml b/chapter06/removeoldnss.xml index 2edf07397..3d2214870 100644 --- a/chapter06/removeoldnss.xml +++ b/chapter06/removeoldnss.xml @@ -5,7 +5,7 @@ to the LFS system (because the normal system runs glibc-2.0) it's time to remove them now by running:</para> -<para><screen><userinput>rm -f /lib/libnss*.so.1 /lib/libnss*2.0*</userinput></screen></para> +<para><screen><userinput>rm /lib/libnss*.so.1 /lib/libnss*2.0*</userinput></screen></para> </sect1> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 9ce63bbbd..120324e2c 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -7,7 +7,7 @@ following commands:</para> <para><screen><userinput>cp src/useradd.c src/useradd.c.backup &&</userinput> <userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \</userinput> <userinput> src/useradd.c > tmp~ &&</userinput> -<userinput>mv -f tmp~ src/useradd.c &&</userinput> +<userinput>mv tmp~ src/useradd.c &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index d47c7ed23..492ecfcf3 100644 --- a/chapter06/shellutils-inst.xml +++ b/chapter06/shellutils-inst.xml @@ -7,9 +7,9 @@ <userinput>make &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>mv -f date echo false pwd stty /bin &&</userinput> -<userinput>mv -f su true uname hostname /bin &&</userinput> -<userinput>mv -f chroot ../sbin</userinput></screen></para> +<userinput>mv date echo false pwd stty /bin &&</userinput> +<userinput>mv su true uname hostname /bin &&</userinput> +<userinput>mv chroot ../sbin</userinput></screen></para> </sect2> diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml index 57f8373f8..078ad2357 100644 --- a/chapter06/sysvinit-inst.xml +++ b/chapter06/sysvinit-inst.xml @@ -15,7 +15,7 @@ processes started by init the TERM signal".</para> <para><screen><userinput>cp src/init.c src/init.c.backup &&</userinput> <userinput>sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \</userinput> <userinput> src/init.c > tmp~ &&</userinput> -<userinput>mv -f tmp~ src/init.c &&</userinput> +<userinput>mv tmp~ src/init.c &&</userinput> <userinput>make -C src &&</userinput> <userinput>make -C src install</userinput></screen></para> diff --git a/chapter06/textutils-inst.xml b/chapter06/textutils-inst.xml index 6fe4e525d..c22802455 100644 --- a/chapter06/textutils-inst.xml +++ b/chapter06/textutils-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>./configure --prefix=/usr &&</userinput> <userinput>make &&</userinput> <userinput>make install &&</userinput> -<userinput>mv -f /usr/bin/cat /bin</userinput></screen></para> +<userinput>mv /usr/bin/cat /bin</userinput></screen></para> </sect2> diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml index b59dcf12d..80d91753c 100644 --- a/chapter06/utillinux-inst.xml +++ b/chapter06/utillinux-inst.xml @@ -8,7 +8,7 @@ util-linux package, FHS-compliant, run the following.</para> <para><screen><userinput>cp hwclock/hwclock.c hwclock/hwclock.c.backup &&</userinput> <userinput>sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \</userinput> <userinput> hwclock/hwclock.c > tmp~ &&</userinput> -<userinput>mv -f tmp~ hwclock/hwclock.c &&</userinput> +<userinput>mv tmp~ hwclock/hwclock.c &&</userinput> <userinput>mkdir -p /var/lib/hwclock</userinput></screen></para> </sect2> diff --git a/chapter07/functions.xml b/chapter07/functions.xml index d9ba8f6f8..918b3e8c6 100644 --- a/chapter07/functions.xml +++ b/chapter07/functions.xml @@ -294,7 +294,7 @@ killproc() # print [ OK ] # - /bin/rm -f /var/run/$base.pid + /bin/rm /var/run/$base.pid print_status success fi else @@ -328,7 +328,7 @@ killproc() # PID file and print [ OK ] # - /bin/rm -f /var/run/$base.pid + /bin/rm /var/run/$base.pid print_status success fi fi diff --git a/chapter07/mountfs.xml b/chapter07/mountfs.xml index a21e6fdad..54e67b03b 100644 --- a/chapter07/mountfs.xml +++ b/chapter07/mountfs.xml @@ -51,7 +51,7 @@ case "$1" in # recreate the files # - /bin/rm -f /fastboot /forcefsck + /bin/rm /fastboot /forcefsck # # Walk through /etc/fstab and mount all file systems that don't |