Removed -f options from mv and rm

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1099 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter05/bzip2-inst.xml

@@ -6,7 +6,7 @@
 <para><screen><userinput>make CC="gcc -static" &amp;&amp;</userinput>
 <userinput>make PREFIX=$LFS/usr install &amp;&amp;</userinput>
 <userinput>cd $LFS/usr/bin &amp;&amp;</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>
 

chapter05/gzip-inst.xml

@@ -9,7 +9,7 @@ unpacked.</para>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;</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>
 

chapter05/shellutils-inst.xml

@@ -9,8 +9,8 @@ to be unpacked.</para>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
-<userinput>mv -f date echo false pwd stty $LFS/bin &amp;&amp;</userinput>
-<userinput>mv -f su true uname hostname $LFS/bin</userinput></screen></para>
+<userinput>mv date echo false pwd stty $LFS/bin &amp;&amp;</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>

chapter05/textutils-inst.xml

@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</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>
 

chapter06/e2fsprogs-inst.xml

@@ -11,7 +11,7 @@ to be like that. We did not forget to supply a value there.</para>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>make install-libs &amp;&amp;</userinput>
-<userinput>mv -f /usr/sbin/mklost+found /sbin</userinput></screen></para>
+<userinput>mv /usr/sbin/mklost+found /sbin</userinput></screen></para>
 
 </sect2>
 

chapter06/ed-inst.xml

@@ -11,7 +11,7 @@
 <userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</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>
 

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

chapter06/glibc-inst.xml

@@ -12,10 +12,10 @@ would do.</para>
 <userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
 <userinput>cp malloc/Makefile malloc/Makefile.backup &amp;&amp;</userinput>
 <userinput>sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ malloc/Makefile &amp;&amp;</userinput>
+<userinput>mv tmp~ malloc/Makefile &amp;&amp;</userinput>
 <userinput>cp login/Makefile login/Makefile.backup &amp;&amp;</userinput>
 <userinput>sed 's/root/0/' login/Makefile &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ login/Makefile &amp;&amp;</userinput>
+<userinput>mv tmp~ login/Makefile &amp;&amp;</userinput>
 <userinput>mkdir ../glibc-build &amp;&amp;</userinput>
 <userinput>cd ../glibc-build &amp;&amp;</userinput>
 <userinput>../glibc-&glibc-version;/configure --prefix=/usr \</userinput>
@@ -23,7 +23,7 @@ would do.</para>
 <userinput>cp config.make config.make.backup &amp;&amp;</userinput>
 <userinput>sed 's/cross-compiling = yes/cross-compiling = no/' \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;config.make &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ config.make &amp;&amp;</userinput>
+<userinput>mv tmp~ config.make &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>make localedata/install-locales &amp;&amp;</userinput>

chapter06/gzip-inst.xml

@@ -7,8 +7,8 @@
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>mv -f gzip /bin &amp;&amp;</userinput>
-<userinput>rm -f gunzip zcat &amp;&amp;</userinput>
+<userinput>mv gzip /bin &amp;&amp;</userinput>
+<userinput>rm gunzip zcat &amp;&amp;</userinput>
 <userinput>cd /bin &amp;&amp;</userinput>
 <userinput>ln -sf gzip gunzip &amp;&amp;</userinput>
 <userinput>ln -sf gzip zcat &amp;&amp;</userinput>

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

chapter06/kbd-inst.xml

@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --datadir=/usr/share/kbd &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</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>
 

chapter06/man-inst.xml

@@ -7,7 +7,7 @@
 <userinput>do</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;cp $i $i.backup &amp;&amp;</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;sed 's/gawk/awk/g' $i &gt; tmp~ &amp;&amp;</userinput>
-<userinput>&nbsp;&nbsp;&nbsp;mv -f tmp~ $i</userinput>
+<userinput>&nbsp;&nbsp;&nbsp;mv tmp~ $i</userinput>
 <userinput>done</userinput>
 <userinput>chmod 700 configure &amp;&amp;</userinput>
 <userinput>./configure -default &amp;&amp;</userinput>

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>
 

chapter06/procps-inst.xml

@@ -5,7 +5,7 @@
 
 <para><screen><userinput>make &amp;&amp;</userinput>
 <userinput>make XSCPT='' install &amp;&amp;</userinput>
-<userinput>mv -f /usr/bin/kill /bin</userinput></screen></para>
+<userinput>mv /usr/bin/kill /bin</userinput></screen></para>
 
 </sect2>
 

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>
 

chapter06/shadowpwd-inst.xml

@@ -7,7 +7,7 @@ following commands:</para>
 <para><screen><userinput>cp src/useradd.c src/useradd.c.backup &amp;&amp;</userinput>
 <userinput>sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;src/useradd.c &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ src/useradd.c &amp;&amp;</userinput>
+<userinput>mv tmp~ src/useradd.c &amp;&amp;</userinput>
 <userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>

chapter06/shellutils-inst.xml

@@ -7,9 +7,9 @@
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cd /usr/bin &amp;&amp;</userinput>
-<userinput>mv -f date echo false pwd stty /bin &amp;&amp;</userinput>
-<userinput>mv -f su true uname hostname /bin &amp;&amp;</userinput>
-<userinput>mv -f chroot ../sbin</userinput></screen></para>
+<userinput>mv date echo false pwd stty /bin &amp;&amp;</userinput>
+<userinput>mv su true uname hostname /bin &amp;&amp;</userinput>
+<userinput>mv chroot ../sbin</userinput></screen></para>
 
 </sect2>
 

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 &amp;&amp;</userinput>
 <userinput>sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;src/init.c &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ src/init.c &amp;&amp;</userinput>
+<userinput>mv tmp~ src/init.c &amp;&amp;</userinput>
 <userinput>make -C src &amp;&amp;</userinput>
 <userinput>make -C src install</userinput></screen></para>
 

chapter06/textutils-inst.xml

@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
-<userinput>mv -f /usr/bin/cat /bin</userinput></screen></para>
+<userinput>mv /usr/bin/cat /bin</userinput></screen></para>
 
 </sect2>
 

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 &amp;&amp;</userinput>
 <userinput>sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \</userinput>
 <userinput>&nbsp;&nbsp;&nbsp;hwclock/hwclock.c &gt; tmp~ &amp;&amp;</userinput>
-<userinput>mv -f tmp~ hwclock/hwclock.c &amp;&amp;</userinput>
+<userinput>mv tmp~ hwclock/hwclock.c &amp;&amp;</userinput>
 <userinput>mkdir -p /var/lib/hwclock</userinput></screen></para>
 
 </sect2>

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

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