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 @@ make CC="gcc -static" && make PREFIX=$LFS/usr install && cd $LFS/usr/bin && -mv -f bzcat bunzip2 bzip2 bzip2recover $LFS/bin +mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin 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. make LDFLAGS=-static && make install && cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin && -rm -f $LFS/usr/bin/gunzip $LFS/usr/bin/gzip +rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip 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. make LDFLAGS=-static && make install && cd $LFS/usr/bin && -mv -f date echo false pwd stty $LFS/bin && -mv -f su true uname hostname $LFS/bin +mv date echo false pwd stty $LFS/bin && +mv su true uname hostname $LFS/bin The patch file only needs to be applied if you are running glibc-2.1.x on your base system. 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 @@ ./configure --prefix=$LFS/usr --disable-nls && make LDFLAGS=-static && make install && -mv -f $LFS/usr/bin/cat $LFS/bin +mv $LFS/usr/bin/cat $LFS/bin 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. make && make install && make install-libs && -mv -f /usr/sbin/mklost+found /sbin +mv /usr/sbin/mklost+found /sbin 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 @@ ./configure --prefix=/usr && make && make install && -mv -f /usr/bin/ed /usr/bin/red /bin +mv /usr/bin/ed /usr/bin/red /bin 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 tmp~. This is done because Glibc can't autodetect perl since it's not installed yet at the time when we install Glibc. -mv -f tmp~ malloc/Makefile: The file +mv tmp~ malloc/Makefile: The file tmp~ is now moved back to malloc/Makefile. 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. -mv -f tmp~ login/Makefile: Asabove, we are using a temporary file (tmp~) to store the +mv tmp~ login/Makefile: Asabove, we are using a temporary file (tmp~) to store the edited Makefile and then copying it back over the original. --enable-add-ons: 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. -mv -f config.make~ config.make: Again, we are moving +mv config.make~ config.make: Again, we are moving the temporary file over the original. exec /bin/bash: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. touch /etc/ld.so.conf && cp malloc/Makefile malloc/Makefile.backup && sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile > tmp~ && -mv -f tmp~ malloc/Makefile && +mv tmp~ malloc/Makefile && cp login/Makefile login/Makefile.backup && sed 's/root/0/' login/Makefile > tmp~ && -mv -f tmp~ login/Makefile && +mv tmp~ login/Makefile && mkdir ../glibc-build && cd ../glibc-build && ../glibc-&glibc-version;/configure --prefix=/usr \ @@ -23,7 +23,7 @@ would do. cp config.make config.make.backup && sed 's/cross-compiling = yes/cross-compiling = no/' \    config.make > tmp~ && -mv -f tmp~ config.make && +mv tmp~ config.make && make && make install && make localedata/install-locales && 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 @@ make && make install && cd /usr/bin && -mv -f gzip /bin && -rm -f gunzip zcat && +mv gzip /bin && +rm gunzip zcat && cd /bin && ln -sf gzip gunzip && ln -sf gzip zcat && 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. -rm -f +rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz: 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 @@ ./configure --datadir=/usr/share/kbd && make && make install && -rm -f /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz +rm /usr/share/kbd/keymaps/i386/qwerty/defkeymap.map.gz 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 @@ do    cp $i $i.backup &&    sed 's/gawk/awk/g' $i > tmp~ && -   mv -f tmp~ $i +   mv tmp~ $i done chmod 700 configure && ./configure -default && 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 @@ Net-tools hostname 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 -rm -f /bin/hostname.old +rm /bin/hostname.old 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 @@ make && make XSCPT='' install && -mv -f /usr/bin/kill /bin +mv /usr/bin/kill /bin 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: -rm -f /lib/libnss*.so.1 /lib/libnss*2.0* +rm /lib/libnss*.so.1 /lib/libnss*2.0* 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: cp src/useradd.c src/useradd.c.backup && sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \    src/useradd.c > tmp~ && -mv -f tmp~ src/useradd.c && +mv tmp~ src/useradd.c && ./configure --prefix=/usr && make && make install && 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 @@ make && make install && cd /usr/bin && -mv -f date echo false pwd stty /bin && -mv -f su true uname hostname /bin && -mv -f chroot ../sbin +mv date echo false pwd stty /bin && +mv su true uname hostname /bin && +mv chroot ../sbin 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". cp src/init.c src/init.c.backup && sed 's/\(.*\)\(Sending processes\)\(.*\)/\1\2 started by init\3/' \    src/init.c > tmp~ && -mv -f tmp~ src/init.c && +mv tmp~ src/init.c && make -C src && make -C src install 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 @@ ./configure --prefix=/usr && make && make install && -mv -f /usr/bin/cat /bin +mv /usr/bin/cat /bin 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. cp hwclock/hwclock.c hwclock/hwclock.c.backup && sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \    hwclock/hwclock.c > tmp~ && -mv -f tmp~ hwclock/hwclock.c && +mv tmp~ hwclock/hwclock.c && mkdir -p /var/lib/hwclock 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